chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6e40a05
)
extras/keymap: teach findkeyboards about USB keyboards
author
Martin Pitt
<martin.pitt@ubuntu.com>
Sat, 18 Jul 2009 14:59:46 +0000
(16:59 +0200)
committer
Martin Pitt
<martin.pitt@ubuntu.com>
Sat, 18 Jul 2009 14:59:46 +0000
(16:59 +0200)
extras/keymap/findkeyboards
patch
|
blob
|
history
diff --git
a/extras/keymap/findkeyboards
b/extras/keymap/findkeyboards
index e39084cde953fc46bee581ead03e0599353da0a7..4fafc7775db13063058c435cac65d8a22a308469 100755
(executable)
--- a/
extras/keymap/findkeyboards
+++ b/
extras/keymap/findkeyboards
@@
-21,12
+21,17
@@
keyboard_devices() {
# standard AT keyboard
for dev in $input_devs; do
# 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
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
done
# modules