movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #204669 from n8henrie/configurable-grub-efi-timeout

Browse source 
nixos/installer/cd-dvd/iso-image: honor EFI boot timeout
This commit is contained in:
Ryan Lahfa 2022-12-30 14:25:26 +01:00 • committed by GitHub
commit b869fc7a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,14 @@ let
else else
config.boot.loader.timeout * 10; 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. # The configuration file for syslinux.
# Notes on syslinux configuration and UNetbootin compatibility: # Notes on syslinux configuration and UNetbootin compatibility:
@ -284,7 +292,7 @@ let
if serial; then set with_serial=yes ;fi if serial; then set with_serial=yes ;fi
export with_serial export with_serial
clear clear
set timeout=10 set timeout=${toString grubEfiTimeout}
# This message will only be viewable when "gfxterm" is not used. # This message will only be viewable when "gfxterm" is not used.
echo "" echo ""