From d855408a58921d1a6000af7e60953024f627926d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 27 May 2024 14:42:16 +0100 Subject: roms: make grubfirst if seabios_withgrub=y rather than if seabios_grubonly=y if grubonly=y, still make the grubonly rom this complements the previous commit Signed-off-by: Leah Rowe --- script/roms | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/script/roms b/script/roms index 3ca0de20..dc3053f4 100755 --- a/script/roms +++ b/script/roms @@ -356,13 +356,16 @@ build_grub_roms() [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \ && newrom="$newrom${board}_${initmode}_$keymap.rom" x_ cprom "$tmpgrubrom" "$newrom" - if [ "$payload_seabios_grubonly" = "y" ]; then + if [ "$payload_seabios_withgrub" = "y" ]; then x_ "$cbfstool" "$tmpgrubrom" add \ -f "config/grub/bootorder" -n bootorder -t raw x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom" - x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \ - -n etc/show-boot-menu - x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom" + if [ "$payload_seabios_grubonly" = "y" ]; then + x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \ + -n etc/show-boot-menu + x_ cprom "$tmpgrubrom" \ + "${newrom%.rom}_grubonly.rom" + fi fi x_ rm -f "$tmpgrubrom" done -- cgit v1.2.1