summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-05-03 23:38:38 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-05-03 23:43:29 +0200
commit08d993981ce3632ca06c76fc9a1744f15bf96668 (patch)
tree26f48d8a8fa44c87760566709957ece4d2dd2836
parent5791a2d9fa12cfbe48376a9219fb3e2ee56a5c63 (diff)
downloaddrakx-08d993981ce3632ca06c76fc9a1744f15bf96668.tar
drakx-08d993981ce3632ca06c76fc9a1744f15bf96668.tar.gz
drakx-08d993981ce3632ca06c76fc9a1744f15bf96668.tar.bz2
drakx-08d993981ce3632ca06c76fc9a1744f15bf96668.tar.xz
drakx-08d993981ce3632ca06c76fc9a1744f15bf96668.zip
don't class Logitech wired kbd+mouse as unknown
just filter them out as those are duplicates of USB devices (mga#3510)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f937a8dc5..88cba6605 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake2:
+ o don't class Logitech wired kbd+mouse as unknown (mga#3510)
+
Version 17.28 - 26 April 2016
- recognize new kernel-4.6 drivers
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 4d3ac0218..afdacc5a2 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -24,7 +24,7 @@ foreach my $dev (@devices) {
sub unknown() {
grep { $_->{media_type} !~ /BRIDGE|class\|Mouse|DISPLAY|Hub|MEMORY_RAM|MULTIMEDIA_(VIDEO|AUDIO|OTHER)|NETWORK|Printer|SERIAL_(USB|SMBUS)|STORAGE_(IDE|OTHER|RAID|SCSI)|SYSTEM_(OTHER|SDHCI)|tape|UPS/
&& !member($_->{driver}, qw(cpia_usb cyber2000fb forcedeth ibmcam megaraid mod_quickcam nvnet ohci1394 ov511 ov518_decomp scanner ultracam usbvideo usbvision))
- && $_->{driver} !~ /^ISDN|Mouse:USB|Removable:zip|class\|Mouse|sata|www.linmodems.org/
+ && $_->{driver} !~ /^ISDN|Mouse:USB|Removable:zip|class\|Mouse|sata|www.linmodems.org|kbd|mouse|sysrq|usbhid/
&& $_->{type} ne 'network'
&& $_->{description} !~ /Alcatel|ADSL Modem/;
} @devices;