Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-16 21:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

live-build/auto/build: Use safer code for kernel handling that doesn't

Browse Source 
cause failures under 'set -o pipefail' in ubuntu-defaults-image
(LP: ).
This commit is contained in:
Colin Watson 2013-01-07 21:31:37 +00:00
parent f73134fbd2
commit a0c446ed24
2 changed files with 9 additions and 1 deletions
debian
changelog
live-build/auto
build

8
debian/changelog vendored

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

2
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