From b26e4ced91d0ac0eabdce1c505228ccafc65a23f Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Mon, 16 Mar 2015 12:00:46 +0100 Subject: hwdb: convert to generic input-modalias matches There is no reason to match on usb-modaliases, if we can use the input-modalias to achieve the same. This commit changes the keyboard-lookups to not be restricted to USB, but pass all modaliases to the hwdb. Furthermore, we convert all usb:* matches to input:* matches, thus getting rid of any ambiguity if multiple usb devices are chained (or a bluetooth device / etc. is on top). Note that legacy keyboard:usb:* matches are still supported, but deprecated. If possible, please use keyboard:input:* matches instead. This is a required step to make other input devices work with 60-keyboard.hwdb. Other bus-types are often chained on usb and we want to avoid any ambiguity here if we incorrectly match on a USB hub. --- rules/60-keyboard.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rules/60-keyboard.rules') diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index 22f71e7792..03343a4817 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -7,8 +7,8 @@ ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end" # ignore all bluetooth devices SUBSYSTEMS=="bluetooth", GOTO="keyboard_end" -# import key mapping for USB device -SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb --lookup-prefix=keyboard:", \ +# import key mapping for input device +IMPORT{builtin}="hwdb --lookup-prefix=keyboard:", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" # import key mapping for AT keyboard from DMI data -- cgit v1.2.3-54-g00ecf