summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-12-09 17:25:15 +0000
committerThierry Vignaud <tv@mandriva.org>2008-12-09 17:25:15 +0000
commit3ff61a58c4334cd7e97003b225e18e99e344af51 (patch)
tree52b913303d8534c01589d19b7c6f9df66567959e
parenta8eb5be8b4e391834a8d65cd4060e5be7f57215f (diff)
downloaddrakx-3ff61a58c4334cd7e97003b225e18e99e344af51.tar
drakx-3ff61a58c4334cd7e97003b225e18e99e344af51.tar.gz
drakx-3ff61a58c4334cd7e97003b225e18e99e344af51.tar.bz2
drakx-3ff61a58c4334cd7e97003b225e18e99e344af51.tar.xz
drakx-3ff61a58c4334cd7e97003b225e18e99e344af51.zip
do not sduplicated hardware as unknown (#46242): track duplicated input devices
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8f38551f8..3491919df 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -12,6 +12,7 @@
(else we could just list all ATA controllers together)
o do not show duplicated hardware as unknown (#46242):
* list PC Speaker as sound card
+ * track duplicated input devices
Version 11.71 - 6 November 2008
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index f51350a32..1c64e1dab 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -478,7 +478,7 @@ our @tree =
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():
- grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/ } detect_devices::getInputDevices();
+ f(grep { $_->{bus} ne 'usb' && $_->{driver} eq 'kbd' && $_->{description} !~ /PC Speaker/ } detect_devices::getInputDevices());
},
checked_on_boot => 0,
},
@@ -500,7 +500,7 @@ our @tree =
detector => sub {
f(grep { $_->{driver} =~ /^Mouse:|^Tablet:/ || $_->{media_type} =~ /class\|Mouse/ } @devices),
# USB devices are filtered out since we already catch them through probeall():
- grep { $_->{bus} ne 'usb' && $_->{Handlers}{mouse} } detect_devices::getInputDevices();
+ f(grep { $_->{bus} ne 'usb' && $_->{Handlers}{mouse} } detect_devices::getInputDevices());
},
checked_on_boot => 1,
automatic => 1,