diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-11-03 14:17:53 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-11-03 14:17:53 +0100 |
| commit | 3a7771c9c499d9d0a1ceb35cbbdfde9c6eefcb0a (patch) | |
| tree | e000137511fc1bab33a884bfffdf8038c65fda70 /hwdb.d/60-autosuspend.hwdb | |
| parent | d3dcf4e3b95e3d3149ee169dc13b43e2e1a02cec (diff) | |
| download | systemd-3a7771c9c499d9d0a1ceb35cbbdfde9c6eefcb0a.tar.gz | |
Partially revert "hwdb: add trailing ":*" everywhere"
This reverts commit c0443b97b71d5f70a0622061f589307bec5502c6.
I got various cases wrong:
"usb:v04F3p2B7Cd5912dc00dsc00dp00ic03isc00ip00in00"
"usb:v0627p0001:QEMU USB Tablet"
"input:b0003v0627p0001e0001-e0,1,2,4,k110,111,112,r0,1,8,B,am4,lsfw"
OTOH:
-evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnASUSTeKComputerInc.:pnN53SV:*
+evdev:name:ETPS/2 Elantech Touchpad:dmi:*svnASUSTeKComputerInc.:pnN53SV*
is OK. Other parts follow after 'pn'.
-mouse:*:name:*Trackball*:*
-mouse:*:name:*trackball*:*
-mouse:*:name:*TrackBall*:*
+mouse:*:name:*Trackball*:
+mouse:*:name:*trackball*:
+mouse:*:name:*TrackBall*:
... and anything else with :name should be OK too, because our imports always
include ":" at the end:
IMPORT{builtin}="hwdb 'joystick:$env{ID_BUS}:v$attr{id/vendor}p$attr{id/product}:name:$attr{name}:'"
Including '*' at the end makes the pattern work even if we decide to add
something to the match string later.
Fixes #17499.
Diffstat (limited to 'hwdb.d/60-autosuspend.hwdb')
| -rw-r--r-- | hwdb.d/60-autosuspend.hwdb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hwdb.d/60-autosuspend.hwdb b/hwdb.d/60-autosuspend.hwdb index 3b42f5a2e7..8ec9f1fb87 100644 --- a/hwdb.d/60-autosuspend.hwdb +++ b/hwdb.d/60-autosuspend.hwdb @@ -34,7 +34,7 @@ ######################################### # AU9540 Smartcard Reader -usb:v058Fp9540:* +usb:v058Fp9540* ID_AUTOSUSPEND=1 ######################################### @@ -42,9 +42,9 @@ usb:v058Fp9540:* ######################################### # X1C8 Touchscreen -usb:v04F3p2B7C:* +usb:v04F3p2B7C* # T14 Gen 1 Touchscreen -usb:v04F3p2ACC:* +usb:v04F3p2ACC* ID_AUTOSUSPEND=1 ######################################### @@ -52,14 +52,14 @@ usb:v04F3p2ACC:* ######################################### # Emulated USB HID devices -usb:v0627p0001:*QEMU USB Keyboard*:* -usb:v0627p0001:*QEMU USB Mouse*:* -usb:v0627p0001:*QEMU USB Tablet*:* +usb:v0627p0001:*QEMU USB Keyboard* +usb:v0627p0001:*QEMU USB Mouse* +usb:v0627p0001:*QEMU USB Tablet* ID_AUTOSUSPEND=1 ######################################### # Wacom ######################################### -usb:v056Ap51A0:* +usb:v056Ap51A0* ID_AUTOSUSPEND=1 |