hwdb: support bluetooth keyboard fixups

[elogind.git] / rules / 60-keyboard.rules

diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index b925853c3ec7653a7ba529c846b8eeec3618edb4..e456292253f1fb1c624d0e9bb22c1e1b8b7dd9f2 100644 (file)
--- a/rules/60-keyboard.rules
+++ b/rules/60-keyboard.rules
@@ -1,22 +1,19 @@
 # do not edit this file, it will be overwritten on update
 
-ACTION!="add", GOTO="keyboard_end"
+ACTION=="remove", GOTO="keyboard_end"
 KERNEL!="event*", GOTO="keyboard_end"
 ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end"
 
-# ignore all bluetooth devices
-SUBSYSTEMS=="bluetooth", GOTO="keyboard_end"
-
-# import key mapping for USB device
-SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb --lookup-prefix=keyboard:", \
-  RUN{program}+="keyboard", GOTO="keyboard_end"
+# import key mapping for input device
+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{program}+="keyboard", GOTO="keyboard_end"
+  RUN{builtin}+="keyboard", GOTO="keyboard_end"
 
 # import key mapping for platform input device
 KERNELS=="input*", IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \
-  RUN{program}+="keyboard", GOTO="keyboard_end"
+  RUN{builtin}+="keyboard", GOTO="keyboard_end"
 
 LABEL="keyboard_end"