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

@@ -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 <cjwatson@ubuntu.com>  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)

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"
+		ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR.efi.signed"
-	else
-		ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR"
 	fi
 	chmod 644 "$PREFIX.kernel-$FLAVOUR"
 	if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then