mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 03:11:12 +00:00
live-build/auto/build: Use slightly safer code for kernel handling just
in case 'set -o pipefail' is ever reinstated here.
This commit is contained in:
parent
31ee0acbd0
commit
c304ced763
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
||||
livecd-rootfs (2.108) UNRELEASED; urgency=low
|
||||
|
||||
* live-build/auto/build: Use slightly safer code for kernel handling just
|
||||
in case 'set -o pipefail' is ever reinstated here.
|
||||
|
||||
-- Colin Watson <cjwatson@ubuntu.com> Mon, 07 Jan 2013 21:24:13 +0000
|
||||
|
||||
livecd-rootfs (2.107) raring; urgency=low
|
||||
|
||||
* Make sure the $PREFIX.kernel-$FLAVOUR.efi.signed output is
|
||||
|
@ -320,7 +320,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user