diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-03-16 12:19:09 +0100 |
|---|---|---|
| committer | David Herrmann <dh.herrmann@gmail.com> | 2015-03-16 12:19:09 +0100 |
| commit | ba76ee29bc02879fb42c048132af8889b00220d5 (patch) | |
| tree | 26d37f5603f79ff9d3f8a88c0caef74232e4412a /rules/60-keyboard.rules | |
| parent | rules: drop redundant match (diff) | |
| download | systemd-ba76ee29bc02879fb42c048132af8889b00220d5.tar.xz systemd-ba76ee29bc02879fb42c048132af8889b00220d5.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | rules/60-keyboard.rules | 6 |
1 files changed, 1 insertions, 5 deletions
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" |