38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From 080747ee6685b9c5877073c5120375e7a04d8216 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Thu, 3 Nov 2022 09:39:36 +0900
|
|
Subject: [PATCH] udev: first set properties based on usb subsystem
|
|
|
|
After 479da1107a0d4e2f7ef5cd938512b87a0e45f180, the usb_id builtin
|
|
command does not set ID_SERIAL if ID_BUS is already set.
|
|
Before the commit, all properties set based on pci bus were overwritten
|
|
by the usb_id, hence now it is sufficient setting them only when ID_BUS is
|
|
not set yet.
|
|
|
|
Fixes #25238.
|
|
|
|
(cherry picked from commit 01e704eba982fbc1517287cd261d229ff8e0a779)
|
|
|
|
Related #2138081
|
|
---
|
|
rules.d/60-serial.rules | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/rules.d/60-serial.rules b/rules.d/60-serial.rules
|
|
index f303e27fd5..c133f26109 100644
|
|
--- a/rules.d/60-serial.rules
|
|
+++ b/rules.d/60-serial.rules
|
|
@@ -3,9 +3,10 @@
|
|
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"
|
|
+SUBSYSTEMS=="pci", ENV{ID_BUS}=="", ENV{ID_BUS}="pci", \
|
|
+ ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}", \
|
|
+ IMPORT{builtin}="hwdb --subsystem=pci"
|
|
|
|
# /dev/serial/by-path/, /dev/serial/by-id/ for USB devices
|
|
KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="serial_end"
|