diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2022-12-30 14:25:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 14:25:26 +0100 |
| commit | b869fc7a90c6733eb41f7ff9cd76cb730f4ea220 (patch) | |
| tree | d7f742fe35178a5c440958551fc0611cb1649a2c /nixos/modules/installer/cd-dvd | |
| parent | 4c5307057ad84440363b873658bb86e4c4d38677 (diff) | |
| parent | 7e1a3e4a8f6cf85cd39d460222e52fe041a95c1c (diff) | |
| download | nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar.gz nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar.bz2 nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar.lz nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar.xz nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.tar.zst nixpkgs-b869fc7a90c6733eb41f7ff9cd76cb730f4ea220.zip | |
Merge pull request #204669 from n8henrie/configurable-grub-efi-timeout
nixos/installer/cd-dvd/iso-image: honor EFI boot timeout
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
| -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 81aca861738..659df7851b0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -77,6 +77,14 @@ let else 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. # Notes on syslinux configuration and UNetbootin compatibility: @@ -284,7 +292,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 "" |