Move loading crypt kernel modules to the crypt module

diff --git a/modules.d/90crypt/install b/modules.d/90crypt/install
index 708d5a493e57df4f7081990f9bfded5045308a0a..250139c4b75b2cb76e7ad0d21a94c0d068d48ecc 100755 (executable)
--- a/modules.d/90crypt/install
+++ b/modules.d/90crypt/install
@@ -1,5 +1,5 @@
 #!/bin/bash
 inst cryptsetup
-instmods dm_crypt =crypto
+instmods dm_crypt cbc aes sha256
 inst_rules "$moddir/63-luks.rules"
 inst "$moddir/cryptroot.sh" "/bin/cryptroot.sh"
\ No newline at end of file

diff --git a/modules.d/90kernel-modules/install b/modules.d/90kernel-modules/install
index 70d16e9c81fabf5155ef715b71a2fb6bae1ff4cd..37062fb1b4b7913fa766407586d04fc3997762b9 100755 (executable)
--- a/modules.d/90kernel-modules/install
+++ b/modules.d/90kernel-modules/install
@@ -1,6 +1,6 @@
 #!/bin/bash
 # FIXME: hard-coded module list of doom.
-instmods ${modules:-=ata =block =drm dm-crypt aes sha256 cbc sd_mod}
+instmods ${modules:-=ata =block sd_mod}
 
 # Grab modules for all filesystem types we currently have mounted
 while read d mp t rest; do