diff options
| author | Nathan Henrie <nate@n8henrie.com> | 2022-12-22 09:33:50 -0700 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2022-12-22 13:25:14 -0600 |
| commit | 3930bcb3c3998dacc7158b30b778213c5cee06a2 (patch) | |
| tree | f011ea4941fe40de6fd234b233e995e1e692527c /nixos/modules/installer/cd-dvd | |
| parent | 7fd752872ea2be04a66226bdc55151baf4105c32 (diff) | |
| download | nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar.gz nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar.bz2 nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar.lz nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar.xz nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.tar.zst nixpkgs-3930bcb3c3998dacc7158b30b778213c5cee06a2.zip | |
Make syslinuxTimeout match documentation
- https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout - https://github.com/NixOS/nixpkgs/blob/cbe419ed4c8f98bd82d169c321d339ea30904f1f/nixos/modules/system/boot/loader/loader.nix#L16 Fixes https://github.com/NixOS/nixpkgs/issues/207289
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 5bd343c85fa..81aca861738 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -70,14 +70,12 @@ let ; # Timeout in syslinux is in units of 1/10 of a second. - # 0 is used to disable timeouts. + # null means max timeout (35996, just under 1h in 1/10 seconds) + # 0 means disable timeout syslinuxTimeout = if config.boot.loader.timeout == null then - 0 + 35996 else - max (config.boot.loader.timeout * 10) 1; - - - max = x: y: if x > y then x else y; + config.boot.loader.timeout * 10; # The configuration file for syslinux. |