From c3d9d43abdb935a8147e8c2cabcc3fcd84c33cf1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 17 Oct 2012 11:48:44 +0100 Subject: [PATCH] Revert binary/$INITFS/kernel-$FLAVOUR to the unsigned kernel, and link signed kernels to binary/$INITFS/kernel-$FLAVOUR.efi.signed instead (LP: #1067659). --- debian/changelog | 8 ++++++++ live-build/auto/build | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82496a59..a84d3a83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.93) UNRELEASED; urgency=low + + * Revert binary/$INITFS/kernel-$FLAVOUR to the unsigned kernel, and link + signed kernels to binary/$INITFS/kernel-$FLAVOUR.efi.signed instead + (LP: #1067659). + + -- Colin Watson Wed, 17 Oct 2012 11:47:35 +0100 + livecd-rootfs (2.92) quantal; urgency=low * disable all slideshows on al preinstalled images, due to (LP: #1066046) diff --git a/live-build/auto/build b/live-build/auto/build index c043a370..3403ab7b 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -334,10 +334,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do echo "Cannot handle more than one kernel for $FLAVOUR ($KVERS)!" >&2 exit 1 fi + ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR" if [ -e "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" ]; then - ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR" - else - ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR" + ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR.efi.signed" fi chmod 644 "$PREFIX.kernel-$FLAVOUR" if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then