[SCM] live-build branch, debian, updated. debian/3.0_a30-1-31-g468a41f

Daniel Baumann daniel at debian.org
Wed Sep 7 15:43:11 UTC 2011


The following commit has been merged in the debian branch:
commit dfaa4a67b55613087cd7beb80fb386a85f1c84f8
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 7 14:16:05 2011 +0200

    Doing uuid.conf extraction from initrd with the correct decompression utility (Closes: #637979).

diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index a7ddef2..1dc8d82 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -91,7 +91,19 @@ case "${LB_INITRAMFS}" in
 			mkdir -p binary/uuid
 			cd binary/uuid
 
-			zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+			case "${LB_INITRAMFS_COMPRESSION}" in
+				gzip)
+					zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+					;;
+
+				bzip2)
+					bzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+					;;
+
+				lzma)
+					lzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
+					;;
+			esac
 
 			if [ -e conf/uuid.conf ]
 			then

-- 
live-build



More information about the debian-live-changes mailing list