diff --git a/ChangeLog b/ChangeLog index 4d9f866..73f8a9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ # - 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ + + 25 Feb 2012; Sebastian Pipping arch/x86/modules_load, + arch/x86_64/modules_load, defaults/modules_load: + Make sure the sha256 module makes it into the initramfs (bug #405495). + Reported by Ogelpre. 20 Feb 2012; Robin H. Johnson defaults/linuxrc: With the new /usr mounting, if the device path that ends up in /proc/mounts diff --git a/arch/x86/modules_load b/arch/x86/modules_load index 3e9f5ec..2c023e4 100644 --- a/arch/x86/modules_load +++ b/arch/x86/modules_load @@ -27,3 +27,5 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8 # Filesystems MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" +# Crypto +MODULES_CRYPTO="sha256_generic" diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load index 4e7d877..6d87b80 100644 --- a/arch/x86_64/modules_load +++ b/arch/x86_64/modules_load @@ -25,3 +25,6 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8 # Filesystems MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" + +# Crypto +MODULES_CRYPTO="sha256_generic" diff --git a/defaults/modules_load b/defaults/modules_load index b726242..7ebd0dd 100644 --- a/defaults/modules_load +++ b/defaults/modules_load @@ -26,3 +26,5 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd usbhid sl8 # Filesystems MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" +# Crypto +MODULES_CRYPTO="sha256_generic"