set grub.cfg timeout to 5s (10 on some boards)
target.cfg can now specify e.g. grub_timeout=20 this would then be inserted as timeout.cfg in cbfs, containing the instruction: set timeout=20 HP laptops need a bit of extra time, due to the delay caused by the EC bug workaround deployed in GRUB desktops in general need extra time. this too is set to 10s, like the HP laptops. only insert timeout.cfg if actually needed (declared in target.cfg), otherwise grub.cfg will default to 5s Signed-off-by: Leah Rowe <leah@libreboot.org>btrfsvols
parent
4a459b0217
commit
a69e8548b3
|
@ -5,3 +5,4 @@ payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -5,3 +5,4 @@ payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_memtest="y"
|
||||||
grub_scan_disk="ata"
|
grub_scan_disk="ata"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_grub_withseabios="y"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_grub_withseabios="y"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_grub_withseabios="y"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -5,3 +5,4 @@ payload_seabios="y"
|
||||||
payload_seabios_withgrub="y"
|
payload_seabios_withgrub="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -5,3 +5,4 @@ payload_seabios="y"
|
||||||
payload_seabios_withgrub="y"
|
payload_seabios_withgrub="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -5,3 +5,4 @@ payload_seabios="y"
|
||||||
payload_seabios_withgrub="y"
|
payload_seabios_withgrub="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_grub_withseabios="y"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_grub_withseabios="y"
|
||||||
payload_seabios="y"
|
payload_seabios="y"
|
||||||
payload_memtest="y"
|
payload_memtest="y"
|
||||||
grub_scan_disk="ahci"
|
grub_scan_disk="ahci"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -6,3 +6,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -7,3 +7,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -7,3 +7,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -7,3 +7,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -7,3 +7,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -7,3 +7,4 @@ payload_memtest="y"
|
||||||
crossgcc_ada="n"
|
crossgcc_ada="n"
|
||||||
microcode_required="n"
|
microcode_required="n"
|
||||||
blobs_required="n"
|
blobs_required="n"
|
||||||
|
grub_timeout=10
|
||||||
|
|
|
@ -26,7 +26,11 @@ elif [ -f (cbfsdisk)/background.jpg ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set default="0"
|
set default="0"
|
||||||
set timeout=30
|
if [ -f (cbfsdisk)/timeout.cfg ]; then
|
||||||
|
source (cbfsdisk)/timeout.cfg
|
||||||
|
else
|
||||||
|
set timeout=5
|
||||||
|
fi
|
||||||
set pager=1
|
set pager=1
|
||||||
set grub_scan_disk="both"
|
set grub_scan_disk="both"
|
||||||
if [ -f (cbfsdisk)/scan.cfg ]; then
|
if [ -f (cbfsdisk)/scan.cfg ]; then
|
||||||
|
|
|
@ -41,6 +41,7 @@ displaymodes=""
|
||||||
payloads=""
|
payloads=""
|
||||||
keyboard_layouts=""
|
keyboard_layouts=""
|
||||||
|
|
||||||
|
grub_timeout=""
|
||||||
grub_scan_disk="undefined"
|
grub_scan_disk="undefined"
|
||||||
tree="undefined"
|
tree="undefined"
|
||||||
arch="undefined"
|
arch="undefined"
|
||||||
|
@ -370,13 +371,18 @@ build_grub_roms() {
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmpscancfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) ||
|
tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) ||
|
||||||
err "mkGrubRom: cannot create temporary scan.cfg"
|
err "mkGrubRom: cannot create temporary scan.cfg"
|
||||||
printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" > \
|
printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" > \
|
||||||
"${tmpscancfg}" || \
|
"${tmpcfg}" || \
|
||||||
err "mkGrubRom: cannot insert into temporary scan.cfg"
|
err "mkGrubRom: cannot insert into temporary scan.cfg"
|
||||||
"${cbfstool}" "${tmprompath}" add -f "${tmpscancfg}" -n scan.cfg \
|
"${cbfstool}" "${tmprompath}" add -f "${tmpcfg}" -n scan.cfg \
|
||||||
-t raw || err "mkGrubROM: cannot insert scan.cfg into CBFS"
|
-t raw || err "mkGrubROM: cannot insert scan.cfg into CBFS"
|
||||||
|
printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" || \
|
||||||
|
err "mkGrubRom: cannot insert into temporary timeout.cfg"
|
||||||
|
[ -z "${grub_timeout}" ] || \
|
||||||
|
"${cbfstool}" "${tmprompath}" add -f "${tmpcfg}" -n timeout.cfg \
|
||||||
|
-t raw || err "mkGrubROM: cannot insert timeout.cfg into CBFS"
|
||||||
|
|
||||||
keymaps=""
|
keymaps=""
|
||||||
if [ -z ${keyboard_layouts} ]; then
|
if [ -z ${keyboard_layouts} ]; then
|
||||||
|
|
Loading…
Reference in New Issue