From a0c446ed24dee7530e27f689d6744dd36910030e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 7 Jan 2013 21:31:37 +0000 Subject: [PATCH] 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). --- debian/changelog | 8 ++++++++ live-build/auto/build | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b161e35c..ab4aa910 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.65.6) UNRELEASED; 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:26:46 +0000 + livecd-rootfs (2.65.5) precise-proposed; urgency=low * Make sure the $PREFIX.kernel-$FLAVOUR.efi.signed output is diff --git a/live-build/auto/build b/live-build/auto/build index 1be2953b..6eb6d104 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -311,7 +311,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do 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