Remove boot.loader.grub.timeout and boot.loader.gummiboot.timeout

There is a generic boot.loader.timeout option.
2016-05-25 11:39:17 +02:00
parent fe875b4100
commit 32bed83b18
9 changed files with 12 additions and 31 deletions
@@ -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 =
      ''