diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-04 06:35:35 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-04 06:35:35 +0000 |
| commit | 4b1037bbf01c4aad8cddc51e409dac93ba998d95 (patch) | |
| tree | 13bd432c15480b8bcbd5a8e25810a3717632df8d | |
| parent | dfd162a812644c03662f885511bef2ab8129cdf6 (diff) | |
| download | drakx-4b1037bbf01c4aad8cddc51e409dac93ba998d95.tar drakx-4b1037bbf01c4aad8cddc51e409dac93ba998d95.tar.gz drakx-4b1037bbf01c4aad8cddc51e409dac93ba998d95.tar.bz2 drakx-4b1037bbf01c4aad8cddc51e409dac93ba998d95.tar.xz drakx-4b1037bbf01c4aad8cddc51e409dac93ba998d95.zip | |
use factorized crypto modules list
| -rw-r--r-- | perl-install/devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/dmcrypt.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 9e67042e4..e4db66e7d 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -28,7 +28,7 @@ sub set_loop { my $dev = find_free_loop(); if ($o_encrypt_key && $o_encryption) { - eval { modules::load('cryptoloop', 'cbc', if_(arch() =~ /i.86/, 'aes-i586'), if_(arch() =~ /x86_64/, 'aes-x86_64'), 'aes_generic') }; + eval { modules::load('cryptoloop', list_modules::category2modules('various/crypto')) }; my $cmd = "losetup -p 0 -e $o_encryption $dev $file"; log::l("calling $cmd"); open(my $F, "|$cmd"); diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm index a0f5b6559..bc611455e 100644 --- a/perl-install/fs/dmcrypt.pm +++ b/perl-install/fs/dmcrypt.pm @@ -16,7 +16,7 @@ sub _crypttab() { "$::prefix/etc/crypttab" } sub init() { whereis_binary('cryptsetup') or die "cryptsetup not installed"; - eval { modules::load('dm-crypt', 'xts', 'cbc', 'sha256_generic', if_(arch() =~ /i.86/, 'aes-i586'), if_(arch() =~ /x86_64/, 'aes-x86_64'), 'aes_generic') }; + eval { modules::load('dm-crypt', list_modules::category2modules('various/crypto')) }; devices::init_device_mapper(); 1; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index d691da219..bb6eff0fd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- load 'aesni_intel' crypto module for newer Intel CPUs (mga#7333) - recognize new drivers: o input: hid-aureal synaptics_usb o wifi: qmi_wwan, mwifiex_usb |