From 6990b9edfe70239852f9d2906f831f21295655af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 25 Nov 2016 11:16:55 +0200
Subject: scripts/mkimage: fix vanilla kernel image name for bootloaders

---
 scripts/mkimg.base.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 0c07fd79dc..00eebea7bc 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -92,14 +92,17 @@ syslinux_gen_config() {
 	echo "PROMPT ${syslinux_prompt:-1}"
 	echo "DEFAULT ${kernel_flavors%% *}"
 
-	local _f
+	local _f _kf
 	for _f in $kernel_flavors; do
+		_kf=""
+		[ "$_f" = vanilla ] || _kf=-$_f
+
 		if [ -z "${xen_params+set}" ]; then
 			cat <<- EOF
 
 			LABEL $_f
 				MENU LABEL Linux $_f
-				KERNEL /boot/vmlinuz-$_f
+				KERNEL /boot/vmlinuz$_kf
 				INITRD /boot/initramfs-$_f
 				DEVICETREEDIR /boot/dtbs
 				APPEND $initfs_cmdline $kernel_cmdline
@@ -110,20 +113,23 @@ syslinux_gen_config() {
 			LABEL $_f
 				MENU LABEL Xen/Linux $_f
 				KERNEL /boot/syslinux/mboot.c32
-				APPEND /boot/xen.gz ${xen_params} --- /boot/vmlinuz-$_f $initfs_cmdline $kernel_cmdline --- /boot/initramfs-$_f
+				APPEND /boot/xen.gz ${xen_params} --- /boot/vmlinuz$_kf $initfs_cmdline $kernel_cmdline --- /boot/initramfs-$_f
 			EOF
 		fi
 	done
 }
 
 grub_gen_config() {
-	local _f
+	local _f _kf
 	echo "set timeout=2"
 	for _f in $kernel_flavors; do
+		_kf=""
+		[ "$_f" = vanilla ] || _kf=-$_f
+
 		cat <<- EOF
 		
 		menuentry "Linux $_f" {
-			linux	/boot/vmlinuz-$_f $initfs_cmdline $kernel_cmdline
+			linux	/boot/vmlinuz$_kf $initfs_cmdline $kernel_cmdline
 			initrd	/boot/initramfs-$_f
 		}
 		EOF
-- 
cgit v1.2.3