diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-28 13:34:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-28 13:47:14 +0200 |
| commit | 640dff2918c7b3636226a9eb97bb76b6236124e3 (patch) | |
| tree | 6433c60d3715ca38e42c4e8fb84abe22e95344f7 /nixos/modules/virtualisation | |
| parent | 7338f5ff4651eaa22ea56eff8b6e9a22066b65ae (diff) | |
| download | nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar.gz nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar.bz2 nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar.lz nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar.xz nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.tar.zst nixlib-640dff2918c7b3636226a9eb97bb76b6236124e3.zip | |
Fix GRUB syntax in EC2 HVM images
There is no "root" command in GRUB 2, and it's not needed anyway. This command delayed HVM boots for a few seconds.
Diffstat (limited to 'nixos/modules/virtualisation')
| -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 dd81c424a91a..165109f20b50 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -32,7 +32,7 @@ let cfg = config.ec2; in 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 = "root (hd0${lib.optionalString cfg.hvm ",0"})"; + boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)"; boot.initrd.postDeviceCommands = '' |