From 21b2c4aab32bf35e9ffa2c215fbeeecfc6a8f1ac Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sat, 2 Jun 2012 23:31:07 +0200 Subject: [PATCH] Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk encryption are included with the initramfs (bug #416973) --- ChangeLog | 5 +++++ arch/x86/modules_load | 2 +- arch/x86_64/modules_load | 2 +- defaults/modules_load | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44edb00..76102bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ # Distributed under the GPL v2 # $Id$ + 02 Jun 2012; Sebastian Pipping 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 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 2c023e4..72506fd 100644 --- 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 6d87b80..4f6eb2d 100644 --- 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 7ebd0dd..001c97e 100644 --- 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" -- 2.26.2