diff options
| author | Kay Sievers <kay@vrfy.org> | 2015-03-18 16:15:27 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-03-18 16:21:02 -0400 |
| commit | bf856b7c02991c75a09609d9320d36071036a2ca (patch) | |
| tree | 8bce285c85f667f1d058dbdf015b2596f4d0a751 | |
| parent | 265a49fca9ce1d053bafaf2554b5d08b1fc53831 (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>
| -rw-r--r-- | hwdb/60-keyboard.hwdb | 2 | ||||
| -rw-r--r-- | rules/60-keyboard.rules | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 0aafcf5a97..204839bce2 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -90,7 +90,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svneMachines:pneMachines*E725:pvr* KEYBOARD_KEY_f8=fn KEYBOARD_KEY_f9=prog1 # Launch NTI shadow -# Acer platform kernel driver +# Acer kernel driver keyboard:name:Acer WMI hotkeys:dmi:bvn*:bvr*:bd*:svn*:pnAcer*:pvr* KEYBOARD_KEY_82=f21 # Touchpad toggle 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" |