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

diff --git a/extras/keymap/findkeyboards b/extras/keymap/findkeyboards
index e39084cde..4fafc7775 100755
--- a/extras/keymap/findkeyboards
+++ b/extras/keymap/findkeyboards
@@ -21,12 +21,17 @@ keyboard_devices() {
 
     # standard AT keyboard
     for dev in $input_devs; do
-        info=`udevadm info --attribute-walk --path=$dev`
+        walk=`udevadm info --attribute-walk --path=$dev`
+        env=`udevadm info --query=env --path=$dev`
         
-        if echo "$info" | grep -q 'DRIVERS=="atkbd"'; then
+        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
+            echo -n 'USB keyboard: '
+            udevadm info --query=name --path=$dev
+        fi
     done
 
     # modules