diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2009-12-11 00:51:07 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2009-12-11 00:51:07 +0000 |
| commit | 086c3d632865fd11a84122fab0e8b75c79e65880 (patch) | |
| tree | f6e62ab9c7a3455dc516649f756fa7b81e4b95d4 /modules/installer/cd-dvd/iso-image.nix | |
| parent | 038180bab853b2d06f4316649b78bd7688b844df (diff) | |
| download | nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar.gz nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar.bz2 nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar.lz nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar.xz nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.tar.zst nixpkgs-086c3d632865fd11a84122fab0e8b75c79e65880.zip | |
making default and timeout of grub overridable
also updating grub option names to current names svn path=/nixos/trunk/; revision=18886
Diffstat (limited to 'modules/installer/cd-dvd/iso-image.nix')
| -rw-r--r-- | modules/installer/cd-dvd/iso-image.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix index 6c1151ca217..3cc558a346d 100644 --- a/modules/installer/cd-dvd/iso-image.nix +++ b/modules/installer/cd-dvd/iso-image.nix @@ -68,8 +68,8 @@ let # The configuration file for Grub. grubCfg = '' - set default=0 - set timeout=10 + set default=${builtins.toString config.boot.loader.grub.default} + set timeout=${builtins.toString config.boot.loader.grub.timeout} if loadfont /boot/grub/unicode.pf2; then set gfxmode=640x480 @@ -189,6 +189,7 @@ in initrd /boot/initrd } ''; + boot.loader.grub.timeout = 10; # Create the ISO image. system.build.isoImage = import ../../../lib/make-iso9660-image.nix { |