nixos/installer/cd-dvd/iso-image: Honor boot.loader.timeout for EFI
EFI boot timeout is currently a static 10 whereas syslinux uses boot.loader.timeout. This changes the EFI config to match. Some discussion at https://discourse.nixos.org/t/how-to-override-let-variables/23741/2
This commit is contained in:
parent
7b560e9728
commit
7e1a3e4a8f
@ -77,6 +77,14 @@ let
|
|||||||
else
|
else
|
||||||
config.boot.loader.timeout * 10;
|
config.boot.loader.timeout * 10;
|
||||||
|
|
||||||
|
# Timeout in grub is in seconds.
|
||||||
|
# null means max timeout (infinity)
|
||||||
|
# 0 means disable timeout
|
||||||
|
grubEfiTimeout = if config.boot.loader.timeout == null then
|
||||||
|
-1
|
||||||
|
else
|
||||||
|
config.boot.loader.timeout;
|
||||||
|
|
||||||
# The configuration file for syslinux.
|
# The configuration file for syslinux.
|
||||||
|
|
||||||
# Notes on syslinux configuration and UNetbootin compatibility:
|
# Notes on syslinux configuration and UNetbootin compatibility:
|
||||||
@ -284,7 +292,7 @@ let
|
|||||||
if serial; then set with_serial=yes ;fi
|
if serial; then set with_serial=yes ;fi
|
||||||
export with_serial
|
export with_serial
|
||||||
clear
|
clear
|
||||||
set timeout=10
|
set timeout=${toString grubEfiTimeout}
|
||||||
|
|
||||||
# This message will only be viewable when "gfxterm" is not used.
|
# This message will only be viewable when "gfxterm" is not used.
|
||||||
echo ""
|
echo ""
|
||||||
|
Loading…
Reference in New Issue
Block a user