summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-09-04 17:11:37 +0000
committerThierry Vignaud <tv@mandriva.org>2007-09-04 17:11:37 +0000
commita9d21c994278a099749364ab42bc61b237479053 (patch)
tree1e3776d7fdde4f1094321e0ef77fad429e195a56
parentebd589dd4624dfa3b8d3f0862bd26186c4964c9c (diff)
downloaddrakx-a9d21c994278a099749364ab42bc61b237479053.tar
drakx-a9d21c994278a099749364ab42bc61b237479053.tar.gz
drakx-a9d21c994278a099749364ab42bc61b237479053.tar.bz2
drakx-a9d21c994278a099749364ab42bc61b237479053.tar.xz
drakx-a9d21c994278a099749364ab42bc61b237479053.zip
detect PS2 to USB converters as keyboards
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5361d0118..fc37123ce 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
o enumerate generic SCSI devices again
- diskdrake
o add a comment (a la ubuntu) in fstab when using UUID=
+- harddrake
+ o detect PS2 to USB converters as keyboards
Version 10.4.184 - 3 September 2007, by Thierry Vignaud
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 373745800..bd6021a01 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -470,7 +470,7 @@ our @tree =
icon => "hw-keyboard.png",
configurator => "$sbindir/keyboarddrake",
detector => sub {
- f(grep { $_->{description} =~ /Keyboard/i } @devices),
+ 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();
},