summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-03-16 15:51:25 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2015-03-16 15:52:48 +0100
commitb17de8449c3ce26031d5bb7dec1086b56e51ac9b (patch)
treeb92db856ce9b85d3a9230d384a83324880656037 /rules
parent496068a8288084ab3ecf8b179a8403ecff1a6be8 (diff)
Revert "hwdb: merge atkbd into platform matches"
This reverts commit ba76ee29bc02879fb42c048132af8889b00220d5. As it turns out, we need to match on driver=atkbd to not load the fixups on any plugged USB devices. That is, whenever you use "name:<name>:dmi:<dmi>" style matches, you better provide a name or you're screwing things up.
Diffstat (limited to 'rules')
-rw-r--r--rules/60-keyboard.rules4
1 files changed, 4 insertions, 0 deletions
diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index a7d679ca92..1f77f5d67e 100644
--- a/rules/60-keyboard.rules
+++ b/rules/60-keyboard.rules
@@ -8,6 +8,10 @@ ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end"
IMPORT{builtin}="hwdb --lookup-prefix=keyboard:", \
RUN{builtin}+="keyboard", GOTO="keyboard_end"
+# import key mapping for AT keyboard from DMI data
+DRIVERS=="atkbd", IMPORT{builtin}="hwdb 'keyboard:$attr{[dmi/id]modalias}'", \
+ RUN{builtin}+="keyboard", GOTO="keyboard_end"
+
# lookup entries matching the machine's DMI data
IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \
RUN{builtin}+="keyboard", GOTO="keyboard_end"