diff -Nru livecd-rootfs-2.65.5/debian/changelog livecd-rootfs-2.65.6/debian/changelog --- livecd-rootfs-2.65.5/debian/changelog 2012-12-04 16:21:49.000000000 +0000 +++ livecd-rootfs-2.65.6/debian/changelog 2013-01-07 21:31:40.000000000 +0000 @@ -1,3 +1,11 @@ +livecd-rootfs (2.65.6) precise; urgency=low + + * live-build/auto/build: Use safer code for kernel handling that doesn't + cause failures under 'set -o pipefail' in ubuntu-defaults-image + (LP: #1097039). + + -- Colin Watson Mon, 07 Jan 2013 21:31:39 +0000 + livecd-rootfs (2.65.5) precise-proposed; urgency=low * Make sure the $PREFIX.kernel-$FLAVOUR.efi.signed output is diff -Nru livecd-rootfs-2.65.5/live-build/auto/build livecd-rootfs-2.65.6/live-build/auto/build --- livecd-rootfs-2.65.5/live-build/auto/build 2012-12-04 16:21:09.000000000 +0000 +++ livecd-rootfs-2.65.6/live-build/auto/build 2013-01-07 19:50:35.000000000 +0000 @@ -311,7 +311,7 @@ if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then continue fi - KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | fgrep -v .efi | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" + KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" if [ -z "$KVERS" ]; then if [ -e "binary/$INITFS/vmlinuz" ]; then # already renamed by ubuntu-defaults-image