swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make syslinuxTimeout match documentation

Browse source 
- https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout
- cbe419ed4c/nixos/modules/system/boot/loader/loader.nix (L16)

Fixes https://github.com/NixOS/nixpkgs/issues/207289
This commit is contained in:
Nathan Henrie 2022-12-22 09:33:50 -07:00 committed by Emery Hemingway
parent 7fd752872e
commit 3930bcb3c3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/installer/cd-dvd/iso-image.nix
View file

@ -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.