From ba76ee29bc02879fb42c048132af8889b00220d5 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 16 Mar 2015 12:19:09 +0100 Subject: hwdb: merge atkbd into platform matches Currently, we always run hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}' as last step to match keyboards. Therefore, if nothing else matched so far, we still try the device-name+dmi combination. However, we have a special atkbd rule which is only run for atkbd as: hwdb 'keyboard:$attr{[dmi/id]modalias}' This is redundant, as we already pass the same information to hwdb in the last fallback step. This patch converts the hwdb "keyboard:dmi:*" matches to "keyboard:name:*:dmi:*" matches and drops the redundant rule. --- rules/60-keyboard.rules | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'rules') diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index 1265b0cfc5..71cef74c5c 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -8,11 +8,7 @@ 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" - -# import key mapping for platform input device +# import key mapping for platform device IMPORT{builtin}="hwdb 'keyboard:name:$attr{name}:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" -- cgit v1.2.3-54-g00ecf