diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix')
| -rw-r--r-- | infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index 20d48add7129..26297a7d0f1f 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -11,6 +11,7 @@ with lib; let cfg = config.ec2; metadataFetcher = import ./ec2-metadata-fetcher.nix { + inherit (pkgs) curl; targetRoot = "$targetRoot/"; wgetExtraOptions = "-q"; }; @@ -48,7 +49,7 @@ in ]; boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ]; boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ]; - boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ]; + boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" "random.trust_cpu=on" ]; # Prevent the nouveau kernel module from being loaded, as it # interferes with the nvidia/nvidia-uvm modules needed for CUDA. @@ -123,7 +124,7 @@ in boot.initrd.extraUtilsCommands = '' # We need swapon in the initrd. - copy_bin_and_libs ${pkgs.utillinux}/sbin/swapon + copy_bin_and_libs ${pkgs.util-linux}/sbin/swapon ''; # Don't put old configurations in the GRUB menu. The user has no |