Merge pull request #209189 from NixOS/backport-204669-to-release-22.11

[Backport release-22.11] nixos/installer/cd-dvd/iso-image: honor EFI boot timeout
This commit is contained in:
Ryan Lahfa
2023-01-22 18:08:02 +01:00
committed by GitHub

View File

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