aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/mkimg.base.sh
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-01-19 01:44:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-01-19 02:04:52 +0000
commitf92a41f7329b5e337476e1cf978b198a2592ffc9 (patch)
tree9ba8b2594e359c5b26976dfa4ed627fbad446f0d /scripts/mkimg.base.sh
parent2a158182c5310b4405e89680042c8f4afceb0f1e (diff)
downloadaports-f92a41f7329b5e337476e1cf978b198a2592ffc9.tar.gz
aports-f92a41f7329b5e337476e1cf978b198a2592ffc9.tar.bz2
aports-f92a41f7329b5e337476e1cf978b198a2592ffc9.tar.xz
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.
Diffstat (limited to 'scripts/mkimg.base.sh')
-rwxr-xr-xscripts/mkimg.base.sh12
1 files changed, 3 insertions, 9 deletions
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