Commit 3930bcb3 authored by Nathan Henrie's avatar Nathan Henrie Committed by Emery Hemingway
Browse files

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
parent 7fd75287

nixos/modules/installer/cd-dvd/iso-image.nix

+4 −6
Original line number Diff line number Diff line
@@ -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.