From f92a41f7329b5e337476e1cf978b198a2592ffc9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 19 Jan 2018 01:44:14 +0000
Subject: scripts: fix -vanilla suffix in bootloaders configs

since commit 697e30450e0759967c0e2eb1c6d45f82b82fe884 the vanilla kernel
has a flavor suffix on vmlinuz. Adjust the boot loader configs
accordingly.
---
 scripts/mkimg.base.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 6a77c2539f..31d3d985d7 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -94,15 +94,12 @@ syslinux_gen_config() {
 
 	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$_kf
+				KERNEL /boot/vmlinuz-$_f
 				INITRD /boot/initramfs-$_f
 				DEVICETREEDIR /boot/dtbs
 				APPEND $initfs_cmdline $kernel_cmdline
@@ -123,13 +120,10 @@ grub_gen_config() {
 	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$_kf $initfs_cmdline $kernel_cmdline
+			linux	/boot/vmlinuz-$_f $initfs_cmdline $kernel_cmdline
 			initrd	/boot/initramfs-$_f
 		}
 		EOF
-- 
cgit v1.2.3