Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk encryption are included with the initramfs (bug #416973)

13 years ago · 21b2c4aab3
parent b65dae0787
commit 21b2c4aab3
4 changed files with 8 additions and 3 deletions
--- a/5
+++ b/5
@ -5,6 +5,11 @@
 # Distributed under the GPL v2
 # $Id$

+  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
+  arch/x86_64/modules_load, defaults/modules_load:
+  Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk
+  encryption are included with the initramfs (bug #416973)
+
  28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
  Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose

--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@ -28,4 +28,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic"
+MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel"
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@ -27,4 +27,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic"
+MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel"
--- a/defaults/modules_load
+++ b/defaults/modules_load
@ -27,4 +27,4 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic"
+MODULES_CRYPTO="sha256_generic cbc aes_generic"