diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog --- live-build-3.0~a24/debian/changelog 2013-01-22 11:00:37.000000000 +0000 +++ live-build-3.0~a24/debian/changelog 2016-02-03 15:57:13.000000000 +0000 @@ -1,3 +1,10 @@ +live-build (3.0~a24-1ubuntu32.7) precise-proposed; urgency=low + + * debian/patches/ubuntu-initramfs-uuid.patch: + - Fix the mechanism of extracting UUID from initrd.img. (LP: #961166) + + -- Shih-Yuan Lee (FourDollars) Tue, 22 Dec 2015 14:38:21 +0800 + live-build (3.0~a24-1ubuntu32.6) precise; urgency=low * Remove Portuguese langpack from i386 Ubuntu desktop image, and Spanish diff -Nru live-build-3.0~a24/debian/patches/series live-build-3.0~a24/debian/patches/series --- live-build-3.0~a24/debian/patches/series 2012-08-23 16:09:16.000000000 +0000 +++ live-build-3.0~a24/debian/patches/series 2016-02-03 15:45:49.000000000 +0000 @@ -24,3 +24,4 @@ ubuntu-chroot_headers_tidy.patch ubuntu-remove-non-release-lists.patch ubuntu-hack-remove-langpacks.patch +ubuntu-initramfs-uuid.patch diff -Nru live-build-3.0~a24/debian/patches/ubuntu-initramfs-uuid.patch live-build-3.0~a24/debian/patches/ubuntu-initramfs-uuid.patch --- live-build-3.0~a24/debian/patches/ubuntu-initramfs-uuid.patch 1970-01-01 00:00:00.000000000 +0000 +++ live-build-3.0~a24/debian/patches/ubuntu-initramfs-uuid.patch 2016-02-03 15:48:30.000000000 +0000 @@ -0,0 +1,48 @@ +Description: Fix the mechanism of extracting UUID from initrd.img +Author: Shih-Yuan Lee (FourDollars) +Applied-Upstream: yes +Last-Update: 2015-12-22 + +Index: live-build-3.0~a24/scripts/build/lb_binary_disk +=================================================================== +--- live-build-3.0~a24.orig/scripts/build/lb_binary_disk 2011-07-13 08:56:18.000000000 +0800 ++++ live-build-3.0~a24/scripts/build/lb_binary_disk 2015-12-22 14:37:52.916683907 +0800 +@@ -82,20 +82,32 @@ + casper) + for INITRD in binary/casper/initrd.img* + do +- mkdir uuid +- cd uuid ++ 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 +- mv conf/uuid.conf "../binary/.disk/casper-uuid${INITRD#binary/casper/initrd.img}" ++ mv conf/uuid.conf "../.disk/casper-uuid${INITRD#binary/casper/initrd.img}" + else + Echo_warning "Failed to find casper uuid.conf in '${INITRD}'" + fi + +- cd .. +- rm -rf uuid ++ cd ${OLDPWD} ++ rm -rf binary/uuid + done + ;; + esac