From: Ville Skyttä Date: Fri, 3 May 2013 20:43:12 +0000 (+0300) Subject: keymap/findkeyboards: avoid throwaway attribute-walk X-Git-Tag: v203~18 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c95686c6ed1879f959a4eb70249167e297751834 keymap/findkeyboards: avoid throwaway attribute-walk --- diff --git a/src/udev/keymap/findkeyboards b/src/udev/keymap/findkeyboards index 9ce27429b..c6b50d12d 100755 --- a/src/udev/keymap/findkeyboards +++ b/src/udev/keymap/findkeyboards @@ -33,12 +33,12 @@ str_line_starts() { keyboard_devices() { # standard AT keyboard 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` # filter out non-event devices, such as the parent input devices which have no devnode if ! echo "$env" | str_line_starts 'DEVNAME='; then continue fi + walk=`udevadm info --attribute-walk --path=$dev` if strstr "$walk" 'DRIVERS=="atkbd"'; then echo -n 'AT keyboard: ' elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then