summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-01-06 15:52:57 +0000
committerThierry Vignaud <tv@mandriva.org>2009-01-06 15:52:57 +0000
commitb100305c15b7f8d99477ca9ef934263c4297c932 (patch)
treebfcc26f0741943700b9049cfcab6bbba187e3005
parentfccdf94dbd892803774394e53f123c44b2cd1803 (diff)
downloaddrakx-backup-do-not-use-b100305c15b7f8d99477ca9ef934263c4297c932.tar
drakx-backup-do-not-use-b100305c15b7f8d99477ca9ef934263c4297c932.tar.gz
drakx-backup-do-not-use-b100305c15b7f8d99477ca9ef934263c4297c932.tar.bz2
drakx-backup-do-not-use-b100305c15b7f8d99477ca9ef934263c4297c932.tar.xz
drakx-backup-do-not-use-b100305c15b7f8d99477ca9ef934263c4297c932.zip
do not sduplicated hardware as unknown (#46242): track duplicated
input devices [backported from trunk]
-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 907ff0f07..bbd89f03c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,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.2 - 5 December 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,