From 6e2338bb4e98e50be8d2f6ad7c1ab2d3f9f2b022 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 14 Sep 2011 12:14:59 +0100 Subject: [PATCH] Squash errors from 'ls vmlinu?-*'. --- debian/changelog | 1 + live-build/auto/build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45efbdf0..221da6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.37) UNRELEASED; urgency=low * BuildLiveCD: Fix typo that broke installing ubuntu-defaults-builder and its recommendations. + * Squash errors from 'ls vmlinu?-*'. -- Colin Watson Mon, 12 Sep 2011 17:51:44 +0100 diff --git a/live-build/auto/build b/live-build/auto/build index fd95b4b2..a7ccd842 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -146,7 +146,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?-*) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" + KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" if [ -z "$KVERS" ]; then if [ -e "binary/$INITFS/vmlinuz" ]; then # already renamed by ubuntu-defaults-image