[SCM] live-build branch, debian-next, updated. debian/2.0_a22-1-1-g2ecae35

Daniel Baumann daniel at debian.org
Sat Aug 14 09:50:21 UTC 2010


The following commit has been merged in the debian-next branch:
commit 2ecae352865edbed619c6a622b790190ccfd0ddb
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Aug 14 11:48:30 2010 +0200

    Adding slightly modified patch from Cody A.W. Somerville <cody.somerville at canonical.com> to extract casper uuid file from casper initrds.

diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index e262c20..612e5fc 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -82,6 +82,28 @@ then
 	> binary/.disk/archive_trace
 fi
 
+case "${LH_INITRAMFS}" in
+	casper)
+		for INITRD in binary/casper/initrd.img*
+		do
+			mkdir uuid
+			cd uuid
+
+			zcat "../${INITRD}" | cpio --quiet -id conf/uuid.conf
+
+			if [ -e conf/uuid.conf ]
+			then
+				mv conf/uuid.conf "../binary/.disk/casper-uuid${INITRD#binary/casper/initrd.img}"
+			else
+				Echo_warning "Failed to find casper uuid.conf in '${INITRD}'"
+			fi
+
+			cd ..
+			rm -rf uuid
+		done
+		;;
+esac
+
 case "${LH_DEBIAN_INSTALLER}" in
 	cdrom)
 		echo "main" > binary/.disk/base_components

-- 
live-build



More information about the debian-live-changes mailing list