summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/modules.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index a5c358bf2..f81b1af4b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -1,4 +1,4 @@
-package modules; # $Id: modules.pm 246711 2008-09-26 09:31:57Z pixel $
+package modules; # $Id: modules.pm 269880 2010-06-04 14:01:44Z pterjan $
use strict;
@@ -94,6 +94,7 @@ sub load_with_options {
my @l = map {
if_(member($_, 'plip', @parallel_zip_modules), 'parport_pc'),
if_($_ eq 'vfat', 'nls_cp437', 'nls_iso8859_1'),
+ if_($_ eq 'btrfs', 'crc32c', 'crc32c-intel'),
dependencies_closure(cond_mapping_24_26($_));
} @$l;
@@ -192,7 +193,8 @@ sub write_preload_conf {
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-aes', 'padlock-sha' if cat_("/proc/cpuinfo") =~ /rng_en/;
- push @l, 'evdev' if any { $_->{Synaptics} || $_->{ALPS} || $_->{HWHEEL} } detect_devices::getInputDevices();
+ push @l, 'evdev' if detect_devices::hasTouchpad();
+ push @l, 'evdev' if any { $_->{HWHEEL} } detect_devices::getInputDevices();
push @l, 'hdaps' if $is_laptop && $manufacturer eq 'LENOVO';
append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l);
}
@@ -257,7 +259,7 @@ sub when_load_category {
if ($category =~ m,disk/ide,) {
$conf->add_probeall('ide-controller', $name);
- eval { load('ide_disk') };
+ eval { load('ide_gd_mod') };
} elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire),) {
$conf->add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };