diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-25 10:34:54 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-05-25 11:39:17 +0200 |
| commit | 32bed83b1804de5e905a2459603dde2b958bb847 (patch) | |
| tree | 92808afac87b0e62f9c3db30a7eed439d3d675b2 /nixos/modules/installer | |
| parent | fe875b41004bafd898645fe3856420b18c63f3f5 (diff) | |
| download | nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar.gz nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar.bz2 nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar.lz nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar.xz nixlib-32bed83b1804de5e905a2459603dde2b958bb847.tar.zst nixlib-32bed83b1804de5e905a2459603dde2b958bb847.zip | |
Remove boot.loader.grub.timeout and boot.loader.gummiboot.timeout
There is a generic boot.loader.timeout option.
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index c31ded977e68..bdb3c227ecc8 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -79,7 +79,7 @@ let echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf echo "default nixos-livecd" > $out/loader/loader.conf - echo "timeout ${builtins.toString config.boot.loader.gummiboot.timeout}" >> $out/loader/loader.conf + echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf ''; efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; } |