From a3352ff4344bf826136e1582c5a830249c5f0834 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 21 Apr 2018 03:26:34 +0200 Subject: 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 --- machines/aszlig/dnyarri.nix | 5 ----- machines/aszlig/managed/shakti.nix | 4 ---- machines/aszlig/tishtushi.nix | 4 ---- 3 files changed, 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"; -- cgit 1.4.1