From: David Herrmann <dh.herrmann@gmail.com>
Date: Fri, 20 Mar 2015 11:28:12 +0000 (+0100)
Subject: rules: avoid 'device/' accesses
X-Git-Tag: v219.0~258
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9a2e1571c0d535ee784cd0401f1086d790c7650b

rules: avoid 'device/' accesses

We should never access parents, as the sysfs hierarchy is in no way
stable. Use KERNELS== etc. to match on a parent, then access it via
$attr{} (which accesses the matching device, not the current device).
---

diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules
index af3edb5f5..fe616917d 100644
--- a/rules/60-keyboard.rules
+++ b/rules/60-keyboard.rules
@@ -13,7 +13,7 @@ DRIVERS=="atkbd", IMPORT{builtin}="hwdb 'keyboard:atkbd:$attr{[dmi/id]modalias}'
   RUN{builtin}+="keyboard", GOTO="keyboard_end"
 
 # device matching the input device name and the machine's DMI data
-IMPORT{builtin}="hwdb 'keyboard:name:$attr{device/name}:$attr{[dmi/id]modalias}'", \
+KERNELS=="input*", IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \
   RUN{builtin}+="keyboard", GOTO="keyboard_end"
 
 LABEL="keyboard_end"