Skip to content

Config generator fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lo1ol wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Config generator fixes #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cfc3f9
Specify path to kernels and initrd images relative to bootloader.conf
lo1ol Aug 20, 2021
09bd9a5
Add searching initrd images of format ${initrdname}${suf}-${kernel}
lo1ol Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion make-bootloader.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ bootloader_update_config()
kver="${kernel##*/vmlinuz}"
kver="${kver#-}"

kernel=${kernel#${bootdir}}
kernel=${kernel#/}

label="${kver:+Kernel ($kver)}"
label="${label:-Default}"

Expand All @@ -106,7 +109,12 @@ 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

if [ -f "$bootdir/$initrd_name$suf${kver:+-$kver}" ]; then
initrd=$initrd_name$suf${kver:+-$kver}
break 2
fi
done
Expand Down