From 9c0c2fe6bb6c3e73d54c65149657dcfdba9b20b0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 15 Dec 2009 11:49:12 +0100 Subject: [PATCH] keymap: fix findkeyboards Update findkeyboards for the recent ID_CLASS deprecation, use ID_INPUT_KEYBOARD instead. This simplifies the logic a bit, too. --- extras/keymap/findkeyboards | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards index 4fafc7775..acff53405 100755 --- a/extras/keymap/findkeyboards +++ b/extras/keymap/findkeyboards @@ -17,21 +17,18 @@ # print a list of input devices which are keyboard-like keyboard_devices() { - input_devs=`udevadm trigger --dry-run --verbose --subsystem-match=input --attr-match=dev` - # standard AT keyboard - for dev in $input_devs; do + for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do walk=`udevadm info --attribute-walk --path=$dev` - env=`udevadm info --query=env --path=$dev` - + env=`udevadm info --query=env --path=$dev` if echo "$walk" | grep -q 'DRIVERS=="atkbd"'; then echo -n 'AT keyboard: ' - udevadm info --query=name --path=$dev - fi - if echo "$env"| grep -q '^ID_CLASS=kbd' && echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then + elif echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then echo -n 'USB keyboard: ' - udevadm info --query=name --path=$dev + else + echo -n 'Unknown type: ' fi + udevadm info --query=name --path=$dev done # modules -- 2.30.2