Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk encrypt...

diff --git a/ChangeLog b/ChangeLog
index 44edb0023edf722cd5735628304f5deaf9ea2fdc..76102bdb9fc174654cbb06c1ca64bf5a131105ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 

diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index 2c023e41c8d0a4b00f6b1459ad9bd5f49728fa67..72506fddccd2d17a76fc904723b65fe7069efa07 100644 (file)
--- 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"

diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index 6d87b805dcac88b89446ec4080a911919ed0fb74..4f6eb2db32b4da48c5399ba6f69928cbdca199e6 100644 (file)
--- 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"

diff --git a/defaults/modules_load b/defaults/modules_load
index 7ebd0dd3a65a529dc1a5f535f056054967c9668c..001c97ee409189d6d834547c4bf2d6a29cc54eab 100644 (file)
--- 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"