X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fkeymap%2Ffindkeyboards;h=5d636de3af4fd3a846b01849763837db537b9254;hp=4fafc7775db13063058c435cac65d8a22a308469;hb=6882949d7a43932b80faa962d019d37fafcf044a;hpb=0b8d9a73335bdd69aa600a0aae42645374cecae9

diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards
index 4fafc7775..5d636de3a 100755
--- a/extras/keymap/findkeyboards
+++ b/extras/keymap/findkeyboards
@@ -17,33 +17,37 @@
 
 # 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`
-        
+        # filter out non-event devices, such as the parent input devices which
+        # have no devnode
+        if ! echo "$env" | grep -q '^DEVNAME='; then
+            continue
+        fi
         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
     module=`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*Extra Buttons'`
     module="$module
+`udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='*extra buttons'`"
+    module="$module
 `udevadm trigger --verbose --dry-run --subsystem-match=input --attr-match=name='Sony Vaio Keys'`"
     for m in $module; do
-	evdev=`ls -d $m/event* 2>/dev/null`
-	if [ -e "$evdev/dev" ]; then
-	    echo -n 'module: '
-	    udevadm info --query=name --path=$evdev
-	fi
+        evdev=`ls -d $m/event* 2>/dev/null`
+        if [ -e "$evdev/dev" ]; then
+            echo -n 'module: '
+            udevadm info --query=name --path=$evdev
+        fi
     done
 }