rules.d: import the keyboard builtin instead of running it

RUN seems to be used primarily for historical reasons over the more
immediate IMPORT command. As a side-effect, RUN also runs *after* all the
rules have been processed which is not really what we want here - we expect
the device to be updated immediately. Other rules that rely on accurate evdev
axes should be able to assume the axes are already present. So let's use
IMPORT here.

For consistency, the second two rules are split across multiple lines as well.

diff --git a/rules.d/60-evdev.rules b/rules.d/60-evdev.rules
index e5e608acd3daa4a73990a1ce8e17aa8842f46ffd..055a62a12d75c094ba1e9c71b58e89a9d259ec18 100644 (file)
--- a/rules.d/60-evdev.rules
+++ b/rules.d/60-evdev.rules
@@ -5,19 +5,21 @@ KERNEL!="event*", GOTO="evdev_end"
 
 # skip later rules when we find something for this input device
 IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \
-  RUN{builtin}+="keyboard", GOTO="evdev_end"
+  IMPORT{builtin}="keyboard", GOTO="evdev_end"
 
 # AT keyboard matching by the machine's DMI data
 DRIVERS=="atkbd", \
   IMPORT{builtin}="hwdb 'evdev:atkbd:$attr{[dmi/id]modalias}'", \
-  RUN{builtin}+="keyboard", GOTO="evdev_end"
+  IMPORT{builtin}="keyboard", GOTO="evdev_end"
 
 # device matching the input device name + properties + the machine's DMI data
-KERNELS=="input*", IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:phys:$attr{phys}:ev:$attr{capabilities/ev}:$attr{[dmi/id]modalias}'", \
-  RUN{builtin}+="keyboard", GOTO="evdev_end"
+KERNELS=="input*", \
+  IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:phys:$attr{phys}:ev:$attr{capabilities/ev}:$attr{[dmi/id]modalias}'", \
+  IMPORT{builtin}="keyboard", GOTO="evdev_end"
 
 # device matching the input device name and the machine's DMI data
-KERNELS=="input*", IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:$attr{[dmi/id]modalias}'", \
-  RUN{builtin}+="keyboard", GOTO="evdev_end"
+KERNELS=="input*", \
+  IMPORT{builtin}="hwdb 'evdev:name:$attr{name}:$attr{[dmi/id]modalias}'", \
+  IMPORT{builtin}="keyboard", GOTO="evdev_end"
 
 LABEL="evdev_end"