From b17de8449c3ce26031d5bb7dec1086b56e51ac9b Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 16 Mar 2015 15:51:25 +0100 Subject: Revert "hwdb: merge atkbd into platform matches" This reverts commit ba76ee29bc02879fb42c048132af8889b00220d5. As it turns out, we need to match on driver=atkbd to not load the fixups on any plugged USB devices. That is, whenever you use "name::dmi:" style matches, you better provide a name or you're screwing things up. --- rules/60-keyboard.rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'rules') diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index a7d679ca92..1f77f5d67e 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -8,6 +8,10 @@ ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end" 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{builtin}+="keyboard", GOTO="keyboard_end" + # lookup entries matching the machine's DMI data IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" -- cgit v1.2.3-54-g00ecf