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=5a22649ec9caf52411589c17ad0815e844935734;hb=6882949d7a43932b80faa962d019d37fafcf044a;hpb=fc799aa6b60595e85b9c8eac4566a90cf83fe6a0

diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards
index 5a22649ec..5d636de3a 100755
--- a/extras/keymap/findkeyboards
+++ b/extras/keymap/findkeyboards
@@ -20,15 +20,20 @@ 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`
+        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: '
-	elif echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then
+        elif echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then
             echo -n 'USB keyboard: '
-	else
-	    echo -n 'Unknown type: '
+        else
+            echo -n 'Unknown type: '
         fi
-	udevadm info --query=name --path=$dev
+        udevadm info --query=name --path=$dev
     done
 
     # modules
@@ -38,11 +43,11 @@ keyboard_devices() {
     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
 }