X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2F60-keyboard.rules;h=fcb948ac028d69cc25e4724e148eee5696c38c5c;hb=5ad6091884425c11abd5920dae77b0c283b54123;hp=1265b0cfc510c0267147d482ce97407f166746b1;hpb=a9c30bca57e4ded8c416c9e319fd313ad346372b;p=elogind.git

diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index 1265b0cfc..fcb948ac0 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"