diff -Nru live-build-3.0~a24/debian/changelog live-build-3.0~a24/debian/changelog --- live-build-3.0~a24/debian/changelog 2012-02-22 19:19:51.000000000 +0000 +++ live-build-3.0~a24/debian/changelog 2012-02-23 16:26:53.000000000 +0000 @@ -1,3 +1,10 @@ +live-build (3.0~a24-1ubuntu26) precise; urgency=low + + * build-wubildr.patch: Revert wubi ext4 switch, until the buildds + are running kernels that can actually mount ext4 filesystems. + + -- Adam Conrad Thu, 23 Feb 2012 09:26:02 -0700 + live-build (3.0~a24-1ubuntu25) precise; urgency=low * build-wubildr.patch: Switch wubi from ext3 to ext4 (LP: #859552) diff -Nru live-build-3.0~a24/debian/patches/build-wubildr.patch live-build-3.0~a24/debian/patches/build-wubildr.patch --- live-build-3.0~a24/debian/patches/build-wubildr.patch 2012-02-22 19:18:38.000000000 +0000 +++ live-build-3.0~a24/debian/patches/build-wubildr.patch 2012-02-23 16:25:58.000000000 +0000 @@ -6,7 +6,7 @@ =================================================================== --- /dev/null +++ b/examples/hooks/ubuntu_binary_build-wubildr.sh -@@ -0,0 +1,34 @@ +@@ -0,0 +1,36 @@ +#! /bin/sh +set -e + @@ -19,7 +19,9 @@ +# in the location that losetup knows it is; however, in a chroot this file wont +# be present, so we need to make it so by the magic of bind mounts: +mkdir -p "ubuntu/disks" -+mv "binary/boot/filesystem.ext4" "ubuntu/disks/root.disk" ++# FIXME: swap these next two lines around when the buildds can handle ext4: ++# mv "binary/boot/filesystem.ext4" "ubuntu/disks/root.disk" ++mv "binary/boot/filesystem.ext3" "ubuntu/disks/root.disk" +mount -o loop "ubuntu/disks/root.disk" "$CHROOT" +# Save the directory structure mkdir created, so that it can be removed later. +REMOVE="$(mkdir -pv "$CHROOT$PWD" | head -n1 | sed "s,.*\`\(.*\)',\1,")"