mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 20:25:38 +03:00
keymap: fix findkeyboards
Update findkeyboards for the recent ID_CLASS deprecation, use ID_INPUT_KEYBOARD instead. This simplifies the logic a bit, too.
This commit is contained in:
parent
8350d0b9ec
commit
9c0c2fe6bb
@ -17,21 +17,18 @@
|
|||||||
|
|
||||||
# print a list of input devices which are keyboard-like
|
# print a list of input devices which are keyboard-like
|
||||||
keyboard_devices() {
|
keyboard_devices() {
|
||||||
input_devs=`udevadm trigger --dry-run --verbose --subsystem-match=input --attr-match=dev`
|
|
||||||
|
|
||||||
# standard AT keyboard
|
# standard AT keyboard
|
||||||
for dev in $input_devs; do
|
for dev in `udevadm trigger --dry-run --verbose --property-match=ID_INPUT_KEYBOARD=1`; do
|
||||||
walk=`udevadm info --attribute-walk --path=$dev`
|
walk=`udevadm info --attribute-walk --path=$dev`
|
||||||
env=`udevadm info --query=env --path=$dev`
|
env=`udevadm info --query=env --path=$dev`
|
||||||
|
|
||||||
if echo "$walk" | grep -q 'DRIVERS=="atkbd"'; then
|
if echo "$walk" | grep -q 'DRIVERS=="atkbd"'; then
|
||||||
echo -n 'AT keyboard: '
|
echo -n 'AT keyboard: '
|
||||||
udevadm info --query=name --path=$dev
|
elif echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then
|
||||||
fi
|
|
||||||
if echo "$env"| grep -q '^ID_CLASS=kbd' && echo "$env" | grep -q '^ID_USB_DRIVER=usbhid'; then
|
|
||||||
echo -n 'USB keyboard: '
|
echo -n 'USB keyboard: '
|
||||||
udevadm info --query=name --path=$dev
|
else
|
||||||
|
echo -n 'Unknown type: '
|
||||||
fi
|
fi
|
||||||
|
udevadm info --query=name --path=$dev
|
||||||
done
|
done
|
||||||
|
|
||||||
# modules
|
# modules
|
||||||
|
Loading…
Reference in New Issue
Block a user