aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorWilliam Johansson <radar@radhuset.org>2018-06-11 21:14:06 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-11 20:57:41 +0000
commit10799b57c447d50bb5044473edc5a59cf117c0ff (patch)
treececb9510dd9c0b8241252f3d736261441cf11802 /scripts
parent1de7c3fe01229be4fd7c81157d3518158abb3833 (diff)
downloadaports-10799b57c447d50bb5044473edc5a59cf117c0ff.tar.bz2
aports-10799b57c447d50bb5044473edc5a59cf117c0ff.tar.xz
scripts: Fix kernel name in Xen BIOS boot
Apply missing changes from f92a41f7329b5e337476e1cf978b198a2592ffc9 Also remove unused variable
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mkimg.base.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 1949f481ab..256c668e34 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -92,7 +92,7 @@ syslinux_gen_config() {
echo "PROMPT ${syslinux_prompt:-1}"
echo "DEFAULT ${kernel_flavors%% *}"
- local _f _kf
+ local _f
for _f in $kernel_flavors; do
if [ -z "${xen_params+set}" ]; then
cat <<- EOF
@@ -110,14 +110,14 @@ syslinux_gen_config() {
LABEL $_f
MENU LABEL Xen/Linux $_f
KERNEL /boot/syslinux/mboot.c32
- APPEND /boot/xen.gz ${xen_params} --- /boot/vmlinuz$_kf $initfs_cmdline $kernel_cmdline --- /boot/initramfs-$_f
+ APPEND /boot/xen.gz ${xen_params} --- /boot/vmlinuz-$_f $initfs_cmdline $kernel_cmdline --- /boot/initramfs-$_f
EOF
fi
done
}
grub_gen_config() {
- local _f _kf
+ local _f
echo "set timeout=2"
for _f in $kernel_flavors; do
if [ -z "${xen_params+set}" ]; then