modules_load: add MODULES_CRYPT, improve backward compatibility

12 years ago · 8ea38a7db9
parent 2b09eabef9
commit 8ea38a7db9
3 changed files with 12 additions and 6 deletions
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@ -29,7 +29,9 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel xts"
+MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
+# Backward compatibility with previous releases
+MODULES_CRYPT="${MODULES_CRYPTO}"

 # DRM (Plymouth support)
 MODULES_PLYMOUTH="radeon nouveau uvesafb"
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@ -28,7 +28,9 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel xts"
+MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
+# Backward compatibility with previous releases
+MODULES_CRYPT="${MODULES_CRYPTO}"

 # DRM (Plymouth support)
 MODULES_PLYMOUTH="radeon nouveau uvesafb"
--- a/defaults/modules_load
+++ b/defaults/modules_load
@ -28,7 +28,9 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd u
 MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"

 # Crypto
-MODULES_CRYPTO="sha256_generic cbc aes_generic xts"
+MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
+# Backward compatibility with previous releases
+MODULES_CRYPT="${MODULES_CRYPTO}"

 # DRM (Plymouth support)
 MODULES_PLYMOUTH="radeon nouveau uvesafb"