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

@@ -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 <cjwatson@ubuntu.com>  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

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