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:
d2bbca6
)
keymap/findkeyboards: avoid throwaway attribute-walk
author
Ville Skyttä
<ville.skytta@iki.fi>
Fri, 3 May 2013 20:43:12 +0000
(23:43 +0300)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Sat, 4 May 2013 02:45:13 +0000
(22:45 -0400)
src/udev/keymap/findkeyboards
patch
|
blob
|
history
diff --git
a/src/udev/keymap/findkeyboards
b/src/udev/keymap/findkeyboards
index 9ce27429b2620ad472975a5608e743115e8d31c4..c6b50d12d0af63d8e352e94a0862a7267cc5f765 100755
(executable)
--- a/
src/udev/keymap/findkeyboards
+++ b/
src/udev/keymap/findkeyboards
@@
-33,12
+33,12
@@
str_line_starts() {
keyboard_devices() {
# standard AT keyboard
for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do
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`
# filter out non-event devices, such as the parent input devices which have no devnode
if ! echo "$env" | str_line_starts 'DEVNAME='; then
continue
fi
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" | str_line_starts 'DEVNAME='; then
continue
fi
+ walk=`udevadm info --attribute-walk --path=$dev`
if strstr "$walk" 'DRIVERS=="atkbd"'; then
echo -n 'AT keyboard: '
elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then
if strstr "$walk" 'DRIVERS=="atkbd"'; then
echo -n 'AT keyboard: '
elif echo "$env" | str_line_starts 'ID_USB_DRIVER=usbhid'; then