diff options
| -rw-r--r-- | hwdb/60-evdev.hwdb | 9 | ||||
| -rw-r--r-- | hwdb/60-keyboard.hwdb | 28 | ||||
| -rw-r--r-- | hwdb/70-mouse.hwdb | 2 | ||||
| -rw-r--r-- | hwdb/70-pointingstick.hwdb | 2 | ||||
| -rw-r--r-- | hwdb/70-touchpad.hwdb | 2 | ||||
| -rw-r--r-- | rules/60-persistent-storage.rules | 4 |
6 files changed, 38 insertions, 9 deletions
diff --git a/hwdb/60-evdev.hwdb b/hwdb/60-evdev.hwdb index 0b692a1b5d..feb4a97192 100644 --- a/hwdb/60-evdev.hwdb +++ b/hwdb/60-evdev.hwdb @@ -15,7 +15,7 @@ # To add local entries, create a new file # /etc/udev/hwdb.d/61-evdev-local.hwdb # and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update +# systemd-hwdb update # udevadm trigger /dev/input/eventXX # where /dev/input/eventXX is the device in question. If in # doubt, simply use /dev/input/event* to reload all input rules. @@ -184,6 +184,13 @@ evdev:name:SynPS/2 Synaptics TouchPad*:dmi:*svnHewlett-Packard:pnHPPaviliondm4* EVDEV_ABS_35=1360:5563:47 EVDEV_ABS_36=1269:4618:61 +# HP Pavilion dv7 +evdev:name:SynPS/2 Synaptics TouchPad*:dmi:*svnHewlett-Packard:pnHPPaviliondv7* + EVDEV_ABS_00=1068:5805:44 + EVDEV_ABS_01=1197:4890:57 + EVDEV_ABS_35=1068:5805:44 + EVDEV_ABS_36=1197:4890:57 + ######################################### # Lenovo ######################################### diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb index 29e2d9027d..fff3b9a6ea 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -4,7 +4,7 @@ # scan codes to add to the AT keyboard's 'force-release' list. # # The lookup keys are composed in: -# 60-keyboard.rules +# 60-evdev.rules # # Note: The format of the "evdev:" prefix match key is a # contract between the rules file and the hardware data, it might @@ -42,11 +42,18 @@ # # To debug key presses and access scan code mapping data of # an input device use the commonly available tool: evtest(1). + +# A device with a fixed keyboard layout that must not be changed by +# the desktop environment may specify that layout as: +# XKB_FIXED_LAYOUT="us" +# XKB_FIXED_VARIANT="" +# Examples of such devices: the Yubikey or other key-code generating +# devices. # # To update this file, create a new file # /etc/udev/hwdb.d/70-keyboard.hwdb # and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update +# systemd-hwdb update # udevadm trigger /dev/input/eventXX # where /dev/input/eventXX is the keyboard in question. If in # doubt, simply use /dev/input/event* to reload all input rules. @@ -416,7 +423,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pnHP*Pavilion*dv7*Notebook*PC: KEYBOARD_KEY_94=reserved # Pavilion x360 13 (Prevents random airplane mode activation) - evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr* +evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO][nN]*13*x360*:pvr* KEYBOARD_KEY_d7=unknown # Elitebook @@ -1244,3 +1251,18 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDIXONSP:pnDIXON*:pvr* KEYBOARD_KEY_a0=! # mute KEYBOARD_KEY_ae=! # volume down KEYBOARD_KEY_b0=! # volume up + +########################################################### +# Fixed layout devices +########################################################### + +# Yubico Yubico Yubikey II" +evdev:input:b0003v1050p0010* +# Yubico Yubikey NEO OTP+CCID +evdev:input:b0003v1050p0111* +# Yubico Yubikey NEO OTP+U2F+CCID +evdev:input:b0003v1050p0116* +# OKE Electron Company USB barcode reader +evdev:input:b0003v05FEp1010* + XKB_FIXED_LAYOUT="us" + XKB_FIXED_VARIANT="" diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb index bf3d134c46..f2a15d2000 100644 --- a/hwdb/70-mouse.hwdb +++ b/hwdb/70-mouse.hwdb @@ -31,7 +31,7 @@ # To add local entries, create a new file # /etc/udev/hwdb.d/71-mouse-local.hwdb # and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update +# systemd-hwdb update # udevadm trigger /dev/input/eventXX # where /dev/input/eventXX is the mouse in question. If in # doubt, simply use /dev/input/event* to reload all input rules. diff --git a/hwdb/70-pointingstick.hwdb b/hwdb/70-pointingstick.hwdb index e18ef28290..117f99455c 100644 --- a/hwdb/70-pointingstick.hwdb +++ b/hwdb/70-pointingstick.hwdb @@ -27,7 +27,7 @@ # To add local entries, create a new file # /etc/udev/hwdb.d/71-pointingstick-local.hwdb # and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update +# systemd-hwdb update # udevadm trigger /dev/input/eventXX # where /dev/input/eventXX is the pointingstick in question. If in # doubt, simply use /dev/input/event* to reload all input rules. diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb index 11f3f96f04..088e63bc31 100644 --- a/hwdb/70-touchpad.hwdb +++ b/hwdb/70-touchpad.hwdb @@ -18,7 +18,7 @@ # To add local entries, create a new file # /etc/udev/hwdb.d/71-touchpad-local.hwdb # and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update +# systemd-hwdb update # udevadm trigger /dev/input/eventXX # where /dev/input/eventXX is the touchpad in question. If in # doubt, simply use /dev/input/event* to reload all input rules. diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index c13d05cdb1..6f60ae9024 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end" ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end" SUBSYSTEM!="block", GOTO="persistent_storage_end" -KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*", GOTO="persistent_storage_end" +KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*|nbd*", GOTO="persistent_storage_end" # ignore partitions that span the entire disk TEST=="whole_disk", GOTO="persistent_storage_end" @@ -54,7 +54,7 @@ KERNEL=="sd*[0-9]", ATTRS{ieee1394_id}=="?*", SYMLINK+="disk/by-id/ieee1394-$att # MMC KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ATTRS{name}=="?*", ATTRS{serial}=="?*", \ ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}" -KERNEL=="mmcblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" +KERNEL=="mmcblk[0-9]p[0-9]*", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n" # Memstick KERNEL=="msblk[0-9]|mspblk[0-9]", SUBSYSTEMS=="memstick", ATTRS{name}=="?*", ATTRS{serial}=="?*", \ |