about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2018-04-21 03:26:34 +0200
committeraszlig <aszlig@nix.build>2018-04-21 03:26:34 +0200
commita3352ff4344bf826136e1582c5a830249c5f0834 (patch)
tree790cd6c9c63849e08fbd2a9e1a3a359c9804d099
parent8066d9de0a18664336616e602bb06220a9553de4 (diff)
machines: Remove unneeded crypto modules in initrd
These were needed a few months ago but they're now automatically added
if boot.initrd.luks.devices is non-empty.

Signed-off-by: aszlig <aszlig@nix.build>
-rw-r--r--machines/aszlig/dnyarri.nix5
-rw-r--r--machines/aszlig/managed/shakti.nix4
-rw-r--r--machines/aszlig/tishtushi.nix4
3 files changed, 0 insertions, 13 deletions
diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index ab2261c2..c9fe7c00 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -39,11 +39,6 @@ in {
     loader.efi.canTouchEfiVariables = true;
 
     initrd = {
-      availableKernelModules = [
-        "aes_x86_64" "af_alg" "algif_skcipher" "cbc" "cryptd" "crypto_simd"
-        "dm_crypt" "ecb" "gf128mul" "glue_helper" "xts"
-      ];
-
       luks.devices = lib.singleton vaultDevice
                   ++ lib.concatLists (lib.attrValues cryptDevices);
       postDeviceCommands = lib.mkAfter ''
diff --git a/machines/aszlig/managed/shakti.nix b/machines/aszlig/managed/shakti.nix
index 39575196..24f2b952 100644
--- a/machines/aszlig/managed/shakti.nix
+++ b/machines/aszlig/managed/shakti.nix
@@ -3,10 +3,6 @@
 {
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.initrd.availableKernelModules = [
-    "aes_x86_64" "af_alg" "algif_skcipher" "cbc" "cryptd" "crypto_simd"
-    "dm_crypt" "ecb" "gf128mul" "glue_helper" "xts"
-  ];
   boot.initrd.luks.devices = [
     { name = "00vault";
       device = "/dev/disk/by-uuid/a70f4ff8-e463-42fa-8148-6783dd352f96";
diff --git a/machines/aszlig/tishtushi.nix b/machines/aszlig/tishtushi.nix
index 12a98977..3c31d4a1 100644
--- a/machines/aszlig/tishtushi.nix
+++ b/machines/aszlig/tishtushi.nix
@@ -14,10 +14,6 @@
 
   boot.initrd = {
     kernelModules = [ "fbcon" "usb_storage" ];
-    availableKernelModules = [
-      "aes_x86_64" "af_alg" "algif_skcipher" "cbc" "cryptd" "crypto_simd"
-      "dm_crypt" "ecb" "gf128mul" "glue_helper" "xts"
-    ];
     luks.devices = [
       { name = "00vault";
         device = "/dev/disk/by-uuid/812f19f1-9096-4367-b2e4-0c9537c52a67";