summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-03-18 16:15:27 -0400
committerAnthony G. Basile <blueness@gentoo.org>2015-03-18 16:21:02 -0400
commitbf856b7c02991c75a09609d9320d36071036a2ca (patch)
tree8bce285c85f667f1d058dbdf015b2596f4d0a751 /rules
parent265a49fca9ce1d053bafaf2554b5d08b1fc53831 (diff)
rules: keyboard - remove platform from comments + prefix "atkbd" match strings like we prefix the "name" strings
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'rules')
-rw-r--r--rules/60-keyboard.rules10
1 files changed, 5 insertions, 5 deletions
diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index 1265b0cfc5..fcb948ac02 100644
--- a/rules/60-keyboard.rules
+++ b/rules/60-keyboard.rules
@@ -4,15 +4,15 @@ ACTION=="remove", GOTO="keyboard_end"
KERNEL!="event*", GOTO="keyboard_end"
ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end"
-# import key mapping for input device
-IMPORT{builtin}="hwdb --lookup-prefix=keyboard:", \
+# skip later rules when we find something for this input device
+IMPORT{builtin}="hwdb --subsystem=input --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}'", \
+# AT keyboard matching by the machine's DMI data
+DRIVERS=="atkbd", IMPORT{builtin}="hwdb 'keyboard:atkbd:$attr{[dmi/id]modalias}'", \
RUN{builtin}+="keyboard", GOTO="keyboard_end"
-# import key mapping for platform input device
+# device matching the input device name and the machine's DMI data
IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \
RUN{builtin}+="keyboard", GOTO="keyboard_end"