about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-11-09 17:47:29 +0100
committerEelco Dolstra <edolstra@gmail.com>2017-11-09 17:53:26 +0100
commit54da9cc944ee871517162a0918e9e3a24e17bce5 (patch)
treea67ebc8eab1e50045fb6dceaddd49307f988b239 /nixos
parent67ba83a934dc04c5f7bafec2370e9080b9a2de8f (diff)
downloadnixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar.gz
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar.bz2
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar.lz
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar.xz
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.tar.zst
nixlib-54da9cc944ee871517162a0918e9e3a24e17bce5.zip
Amazon image: Add NVMe support to the initrd
This is required by the new c5.* instance types.

Note that this changes disk names from /dev/xvd* to
/dev/nvme0n*. Amazon Linux has a udev rule that calls a Python script
named "ec2nvme-nsid" to create compatibility symlinks. We could use
that, but it would mean adding Python to the AMI closure...
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/amazon-image.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 3e47710361a8..1eb3ca707afd 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -33,7 +33,7 @@ let cfg = config.ec2; in
         config.boot.kernelPackages.ena
       ];
     boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
-    boot.initrd.availableKernelModules = [ "ixgbevf" "ena" ];
+    boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
     boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
 
     # Prevent the nouveau kernel module from being loaded, as it