diff options
| author | Nathan Henrie <nate@n8henrie.com> | 2022-12-05 11:46:59 -0700 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-01-05 17:40:28 +0000 |
| commit | c8b1032cc4ea485c87c31cc09cb6dc662b999764 (patch) | |
| tree | e4fdf13ee3a460db18f3c579e5049336dbec3437 | |
| parent | Merge pull request #209159 from NixOS/backport-209090-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-204669-to-release-22.11.tar.gz | |
nixos/installer/cd-dvd/iso-image: Honor boot.loader.timeout for EFIorigin/backport-204669-to-release-22.11
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
(cherry picked from commit 7e1a3e4a8f6cf85cd39d460222e52fe041a95c1c)
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index e37142f05f41..f6aae9e3f410 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -79,6 +79,14 @@ let max = x: y: if x > y then x else y; + # 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. # Notes on syslinux configuration and UNetbootin compatiblity: @@ -286,7 +294,7 @@ let if serial; then set with_serial=yes ;fi export with_serial clear - set timeout=10 + set timeout=${toString grubEfiTimeout} # This message will only be viewable when "gfxterm" is not used. echo "" |