X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2F60-keyboard.rules;h=fe616917da8569baad1412cc70e9d4f7ec1d6750;hb=c87664fef45fc1dadc2303675ed357e0dde61db9;hp=e456292253f1fb1c624d0e9bb22c1e1b8b7dd9f2;hpb=aee26b12763bf12de1313c4a957f33227f94bebd;p=elogind.git

diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index e45629225..fe616917d 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
 KERNELS=="input*", IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \
   RUN{builtin}+="keyboard", GOTO="keyboard_end"