summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-03 19:57:02 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-03 19:57:02 +0000
commit44492735b3c15650c1d492dd4c8b17fc903ecc01 (patch)
tree32f01ff95acd5049f7704e0088d5d0fe137fe397 /perl-install
parentca9e241074aa919c42879deefcf8b65033dfb35b (diff)
downloaddrakx-backup-do-not-use-44492735b3c15650c1d492dd4c8b17fc903ecc01.tar
drakx-backup-do-not-use-44492735b3c15650c1d492dd4c8b17fc903ecc01.tar.gz
drakx-backup-do-not-use-44492735b3c15650c1d492dd4c8b17fc903ecc01.tar.bz2
drakx-backup-do-not-use-44492735b3c15650c1d492dd4c8b17fc903ecc01.tar.xz
drakx-backup-do-not-use-44492735b3c15650c1d492dd4c8b17fc903ecc01.zip
(write_preload_conf) select proper padlock module for Via CPU (Derek Jennings, #38311)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/modules.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 79299f081..59e926262 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- select proper padlock module for Via CPU (#38311)
+
Version 10.7 - 3 March 2008
- bootloader-config:
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index fcad326db..4d69cc1b6 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -191,7 +191,7 @@ sub write_preload_conf {
push @l, detect_devices::probe_name('Module');
push @l, 'nvram' if $is_laptop;
push @l, map { $_->{driver} } detect_devices::probe_category($_) foreach qw(multimedia/dvb multimedia/tv various/agpgart various/laptop input/joystick various/crypto disk/card_reader);
- push @l, 'padlock' if cat_("/proc/cpuinfo") =~ /rng_en/;
+ push @l, 'padlock-aes\npadlock-sha' if cat_("/proc/cpuinfo") =~ /rng_en/;
push @l, 'evdev' if any { $_->{Synaptics} || $_->{ALPS} || $_->{HWHEEL} } detect_devices::getInputDevices();
push @l, 'asus_acpi' if $is_laptop && $manufacturer =~ m/^ASUS/;
push @l, 'thinkpad_acpi' if $is_laptop && member($manufacturer, qw(IBM LENOVO));