mirror of
https://github.com/systemd/systemd.git
synced 2024-12-25 01:34:28 +03:00
451ba55fec
This reverts commit 876c75fe87
.
The patch seems to cause usb devices to get some attributes set from the parent
PCI device. 'hwdb' builtin has support for breaking iteration upwards on usb
devices. But when '--subsystem=foo' is specified, iteration is continued. I'm
sure it *could* be figured out, but it seems hard to get all the combinations
correct. So let's revert to functional status quo ante, even if does the lookup
more than once unnecessarily.
Fixes #18125.
27 lines
1.2 KiB
Plaintext
27 lines
1.2 KiB
Plaintext
# do not edit this file, it will be overwritten on update
|
|
|
|
ACTION=="remove", GOTO="serial_end"
|
|
SUBSYSTEM!="tty", GOTO="serial_end"
|
|
|
|
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
|
|
SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
|
|
SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
|
|
|
|
# /dev/serial/by-path/, /dev/serial/by-id/ for USB devices
|
|
KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="serial_end"
|
|
|
|
SUBSYSTEMS=="usb-serial", ENV{.ID_PORT}="$attr{port_number}"
|
|
|
|
IMPORT{builtin}="path_id"
|
|
ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="", SYMLINK+="serial/by-path/$env{ID_PATH}"
|
|
ENV{ID_PATH}=="?*", ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-path/$env{ID_PATH}-port$env{.ID_PORT}"
|
|
|
|
IMPORT{builtin}="usb_id"
|
|
ENV{ID_SERIAL}=="", GOTO="serial_end"
|
|
SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACE_NUM}="$attr{bInterfaceNumber}"
|
|
ENV{ID_USB_INTERFACE_NUM}=="", GOTO="serial_end"
|
|
ENV{.ID_PORT}=="", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}"
|
|
ENV{.ID_PORT}=="?*", SYMLINK+="serial/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}-port$env{.ID_PORT}"
|
|
|
|
LABEL="serial_end"
|