summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-09 06:00:27 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-09 06:00:27 +0000
commit3ad87c457755042ce3fc7215b23509b5ad24758e (patch)
tree0060c1b65381a2f7cbac694b26873b2a8d4cb9de
parent78386db640777f6cc85ca8616e6d4b015725d6df (diff)
downloaddrakx-3ad87c457755042ce3fc7215b23509b5ad24758e.tar
drakx-3ad87c457755042ce3fc7215b23509b5ad24758e.tar.gz
drakx-3ad87c457755042ce3fc7215b23509b5ad24758e.tar.bz2
drakx-3ad87c457755042ce3fc7215b23509b5ad24758e.tar.xz
drakx-3ad87c457755042ce3fc7215b23509b5ad24758e.zip
list HID USB devices with keyboards
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a0a8bbbd8..74ae9906f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,7 @@
o allow to choose btrfs in normal mode (mga#65)
- harddrake:
o fix displayed PCI/USB ids (spot in mga#9674)
+ o list HID USB devices with keyboards
Version 15.36 - 6 April 2013
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 76ba48531..7c8b95198 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -477,7 +477,7 @@ our @tree =
detector => sub {
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} =~ /^event|kbd/ && $_->{description} !~ /PC Speaker/;
+ $_->{bus} ne 'usb' && $_->{driver} =~ /^event|kbd|^usbhid/ && $_->{description} !~ /PC Speaker/;
} @devices);
},
checked_on_boot => 0,