Merge remote-tracking branch 'origin/bug-405495'

Conflicts:
	ChangeLog
	arch/x86_64/modules_load
cleanup-cruft
Robin H. Johnson 13 years ago
commit 4a3e1ff1cf

@ -4,6 +4,11 @@
# - 2008-2011 Various authors (see AUTHORS)
# Distributed under the GPL v2
# $Id$
25 Feb 2012; Sebastian Pipping <sping@gentoo.org> 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 <robbat2@gentoo.org> defaults/linuxrc:
With the new /usr mounting, if the device path that ends up in /proc/mounts

@ -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"

@ -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"

@ -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"

Loading…
Cancel
Save