summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2018-04-17 14:36:00 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2018-04-17 14:40:38 +0200
commit34642aab658e005cfa2485e5ce259ab929e1619e (patch)
tree60d48152d2a9fc1a60b736aad159d335c4dec03b
parentdb3bcbdcd916208cb05016f18b3e36a1d858fec0 (diff)
downloaddrakx-34642aab658e005cfa2485e5ce259ab929e1619e.tar
drakx-34642aab658e005cfa2485e5ce259ab929e1619e.tar.gz
drakx-34642aab658e005cfa2485e5ce259ab929e1619e.tar.bz2
drakx-34642aab658e005cfa2485e5ce259ab929e1619e.tar.xz
drakx-34642aab658e005cfa2485e5ce259ab929e1619e.zip
don't list HDA "input" devices as keyboards
Those are listed in /proc/bus/input/devices (mga#9986) (cherry picked from commit ae6acbf65a1911b5ae29e216901a7a2ac3cd4080)
-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 a616219f3..ad73b267f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake2:
+ o don't list HDA "input" devices as keyboards (mga#9986)
+
Version 17.88.1 - 18 September 2017
- drakboot:
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 1564d0907..8d4d4de21 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -303,7 +303,7 @@ our @tree =
require list_modules;
my @modules = list_modules::category2modules('multimedia/sound');
f(grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO|PROCESSOR_CO/ || member($_->{driver}, @modules)
- || $_->{description} =~ /PC Speaker/ } @devices);
+ || $_->{description} =~ /^\|?HDA |PC Speaker/ } @devices);
},
checked_on_boot => 1,
},