Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Squash errors from 'ls vmlinu?-*'.

Browse Source
This commit is contained in:
Colin Watson 2011-09-14 12:14:59 +01:00
parent e831b59f31
commit 6e2338bb4e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -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 <cjwatson@ubuntu.com> Mon, 12 Sep 2011 17:51:44 +0100

2
live-build/auto/build
View File

@ -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