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/virtualisation/amazon-image.nix | |
| parent | fe875b41004bafd898645fe3856420b18c63f3f5 (diff) | |
| download | nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar.gz nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar.bz2 nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar.lz nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar.xz nixpkgs-32bed83b1804de5e905a2459603dde2b958bb847.tar.zst nixpkgs-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/virtualisation/amazon-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 5d99bccb0e9..9e8417cde1d 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -32,8 +32,8 @@ let cfg = config.ec2; in # Generate a GRUB menu. Amazon's pv-grub uses this to boot our kernel/initrd. boot.loader.grub.version = if cfg.hvm then 2 else 1; boot.loader.grub.device = if cfg.hvm then "/dev/xvda" else "nodev"; - boot.loader.grub.timeout = 0; boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; + boot.loader.timeout = 0; boot.initrd.postDeviceCommands = '' |