diff options
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index dce726063..4bc2a0928 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1143,6 +1143,8 @@ sub matching_types() { } sub hasWacom() { find { $_->{vendor} == 0x056a || $_->{driver} =~ /wacom/ } usb_probe() } +sub hasTouchpad() { any { $_->{Synaptics} || $_->{ALPS} || $_->{Elantech} } getInputDevices() }; + sub usbWacom() { grep { $_->{vendor} eq '056a' } getInputDevices() } sub usbKeyboards() { grep { $_->{media_type} =~ /\|Keyboard/ } usb_probe() } sub usbStorage() { grep { $_->{media_type} =~ /Mass Storage\|/ } usb_probe() } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index f6e481973..e1ad11906 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -192,7 +192,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} || $_->{Elantech} || $_->{HWHEEL} } detect_devices::getInputDevices(); + push @l, 'evdev' if detect_devices::hasTouchpad(); + push @l, 'evdev' if any { $_->{HWHEEL} } getInputDevices(); push @l, 'hdaps' if $is_laptop && $manufacturer eq 'LENOVO'; append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l); } |