diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:54:19 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-06 15:54:19 +0000 |
| commit | 7503adced193b77d54c7f91ac23f1ebf96b69363 (patch) | |
| tree | 4e70db72e9afa4d2aae00a44a0267397337f5a60 | |
| parent | ac197dc094b09b38b9af0b6d089b2457d98a768b (diff) | |
| download | drakx-7503adced193b77d54c7f91ac23f1ebf96b69363.tar drakx-7503adced193b77d54c7f91ac23f1ebf96b69363.tar.gz drakx-7503adced193b77d54c7f91ac23f1ebf96b69363.tar.bz2 drakx-7503adced193b77d54c7f91ac23f1ebf96b69363.tar.xz drakx-7503adced193b77d54c7f91ac23f1ebf96b69363.zip | |
no need to probe input devices thrice (they are already listed in
@devices through detect_devices::probe_all() ->
getInputDevices_and_usb() -> getInputDevices())
[backported from trunk]
| -rw-r--r-- | perl-install/harddrake/data.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index fb23ebfd4..9d538c0aa 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -476,9 +476,10 @@ our @tree = icon => "hw-keyboard.png", configurator => "$sbindir/keyboarddrake", detector => sub { - f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i } @devices), - # USB devices are filtered out since we already catch them through probeall(): - f(grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/ } detect_devices::getInputDevices()); + f(grep { $_->{description} =~ /Keyboard/i || $_->{media_type} =~ /Subclass\|Keyboard/i || + # USB devices are filtered out since we already catch them through probeall(): + $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/ + } @devices), }, checked_on_boot => 0, }, @@ -498,9 +499,10 @@ our @tree = icon => "hw_mouse.png", configurator => "$sbindir/mousedrake", detector => sub { - f(grep { $_->{driver} =~ /^Mouse:|^Tablet:/ || $_->{media_type} =~ /class\|Mouse/ } @devices), - # USB devices are filtered out since we already catch them through probeall(): - f(grep { $_->{bus} ne 'usb' && $_->{Handlers}{mouse} } detect_devices::getInputDevices()); + f(grep { $_->{driver} =~ /^Mouse:|^Tablet:/ || $_->{media_type} =~ /class\|Mouse/ || + # USB devices are filtered out since we already catch them through probeall(): + $_->{bus} ne 'usb' && $_->{Handlers}{mouse} + } @devices), }, checked_on_boot => 1, automatic => 1, |