From 8ea38a7db97e9508bf7fdad0d406b73e0ff4f032 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 6 May 2013 23:11:46 +0200 Subject: [PATCH] modules_load: add MODULES_CRYPT, improve backward compatibility --- arch/x86/modules_load | 6 ++++-- arch/x86_64/modules_load | 6 ++++-- defaults/modules_load | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/modules_load b/arch/x86/modules_load index 12a54a5..c643d2f 100644 --- 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" \ No newline at end of file +MODULES_PLYMOUTH="radeon nouveau uvesafb" diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load index 883bc2d..e036d07 100644 --- 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" \ No newline at end of file +MODULES_PLYMOUTH="radeon nouveau uvesafb" diff --git a/defaults/modules_load b/defaults/modules_load index cc91ff0..49e68df 100644 --- 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" \ No newline at end of file +MODULES_PLYMOUTH="radeon nouveau uvesafb"