summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-03-17 14:01:14 +0000
committerOlivier Blin <oblin@mandriva.com>2008-03-17 14:01:14 +0000
commitff140d42c4f3a155726151f8ec3537625ea97262 (patch)
tree1d0019de5760643995009fe51c6f5fabe89ad0a6
parent373630b99d417f53c5726b2bbfcca94a49e14a84 (diff)
downloaddrakx-backup-do-not-use-ff140d42c4f3a155726151f8ec3537625ea97262.tar
drakx-backup-do-not-use-ff140d42c4f3a155726151f8ec3537625ea97262.tar.gz
drakx-backup-do-not-use-ff140d42c4f3a155726151f8ec3537625ea97262.tar.bz2
drakx-backup-do-not-use-ff140d42c4f3a155726151f8ec3537625ea97262.tar.xz
drakx-backup-do-not-use-ff140d42c4f3a155726151f8ec3537625ea97262.zip
do not write aliases for asus_acpi and thinkpad_acpi in modprobe.preload, the modules are now handled by coldplug
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/modules.pm2
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1ec4ca5a1..24274f720 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- do not write aliases for asus_acpi and thinkpad_acpi in
+ modprobe.preload, the modules are now handled by coldplug
+
Version 10.15 - 14 March 2008
- fix changing UID on forking
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 26b819791..c6602d2b8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not write aliases for asus_acpi and thinkpad_acpi in
+ modprobe.preload, the modules are now handled by coldplug
+
Version 10.15 - 14 March 2008
- 2008.1 RC2 logo
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index fc68c9bf4..ba4b2a781 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -193,8 +193,6 @@ sub write_preload_conf {
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-aes', 'padlock-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));
push @l, 'hdaps' if $is_laptop && $manufacturer eq 'LENOVO';
append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l);
}