From 3cfc3f95aba1c910ded834861801289f6556c972 Mon Sep 17 00:00:00 2001 From: Petr Mikhalicin Date: Fri, 20 Aug 2021 11:00:09 +0300 Subject: [PATCH 1/2] Specify path to kernels and initrd images relative to bootloader.conf Signed-off-by: Petr Mikhalicin --- make-bootloader.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make-bootloader.in b/make-bootloader.in index 47863ed40..d383c5e1d 100755 --- a/make-bootloader.in +++ b/make-bootloader.in @@ -94,6 +94,9 @@ bootloader_update_config() kver="${kernel##*/vmlinuz}" kver="${kver#-}" + kernel=${kernel#${bootdir}} + kernel=${kernel#/} + label="${kver:+Kernel ($kver)}" label="${label:-Default}" @@ -106,7 +109,7 @@ bootloader_update_config() for initrd_name in initrd initramfs; do for suf in '' '.img'; do if [ -f "$bootdir/$initrd_name${kver:+-$kver}$suf" ]; then - initrd="$bootdir/$initrd_name${kver:+-$kver}$suf" + initrd="$initrd_name${kver:+-$kver}$suf" break 2 fi done From 09bd9a52c42bb948cc4b793706d0f2d9e4055b47 Mon Sep 17 00:00:00 2001 From: Petr Mikhalicin Date: Fri, 20 Aug 2021 11:27:07 +0300 Subject: [PATCH 2/2] Add searching initrd images of format ${initrdname}${suf}-${kernel} Signed-off-by: Petr Mikhalicin --- make-bootloader.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/make-bootloader.in b/make-bootloader.in index d383c5e1d..401077c12 100755 --- a/make-bootloader.in +++ b/make-bootloader.in @@ -112,6 +112,11 @@ bootloader_update_config() initrd="$initrd_name${kver:+-$kver}$suf" break 2 fi + + if [ -f "$bootdir/$initrd_name$suf${kver:+-$kver}" ]; then + initrd=$initrd_name$suf${kver:+-$kver} + break 2 + fi done done