[systemd-devel] [PATCH 2/2] findkeyboards: Avoid throwaway attribute-walk.

Ville Skyttä ville.skytta at iki.fi
Fri May 3 13:43:12 PDT 2013


---
 src/udev/keymap/findkeyboards | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/udev/keymap/findkeyboards b/src/udev/keymap/findkeyboards
index 9ce2742..c6b50d1 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
-- 
1.7.11.7



More information about the systemd-devel mailing list