rules: mount fuse filesystem only 'add'

[elogind.git] / extras / keymap / findkeyboards

diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards
index e39084cde953fc46bee581ead03e0599353da0a7..5a22649ec9caf52411589c17ad0815e844935734 100755 (executable)
--- a/extras/keymap/findkeyboards
+++ b/extras/keymap/findkeyboards
@@ -17,21 +17,25 @@
 
 # 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
-        info=`udevadm info --attribute-walk --path=$dev`
-        
-        if echo "$info" | grep -q 'DRIVERS=="atkbd"'; then
+    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`
+        if echo "$walk" | grep -q 'DRIVERS=="atkbd"'; then
             echo -n 'AT keyboard: '
-            udevadm info --query=name --path=$dev
+       elif echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then
+            echo -n 'USB keyboard: '
+       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`