Skip to content

Commit 3cfc3f9

Browse files
committed
Specify path to kernels and initrd images relative to bootloader.conf
Signed-off-by: Petr Mikhalicin <pmikhalicin@rutoken.ru>
1 parent 9979dc5 commit 3cfc3f9

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

make-bootloader.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ bootloader_update_config()
9494
kver="${kernel##*/vmlinuz}"
9595
kver="${kver#-}"
9696

97+
kernel=${kernel#${bootdir}}
98+
kernel=${kernel#/}
99+
97100
label="${kver:+Kernel ($kver)}"
98101
label="${label:-Default}"
99102

@@ -106,7 +109,7 @@ bootloader_update_config()
106109
for initrd_name in initrd initramfs; do
107110
for suf in '' '.img'; do
108111
if [ -f "$bootdir/$initrd_name${kver:+-$kver}$suf" ]; then
109-
initrd="$bootdir/$initrd_name${kver:+-$kver}$suf"
112+
initrd="$initrd_name${kver:+-$kver}$suf"
110113
break 2
111114
fi
112115
done

0 commit comments

Comments
 (0)