From f17491e27d5a4258516249a0369b95a0e1544ab8 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 25 Oct 2012 22:17:05 +0200 Subject: [PATCH] rules: fix usb_id/hwdb mixup in tty-description.rules btw, in 15ce372b75a "call 'hwdb' with --subsystem=" you actually added "usb_id --subsystem=usb" (75-tty-description.rules) ouch :) --- rules/75-tty-description.rules | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules index c8ee376ba..bfa6de39e 100644 --- a/rules/75-tty-description.rules +++ b/rules/75-tty-description.rules @@ -3,12 +3,13 @@ ACTION=="remove", GOTO="tty_end" SUBSYSTEM!="tty", GOTO="tty_end" -IMPORT{builtin}="hwdb" - -SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id --subsystem=usb" +SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" +SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}" SUBSYSTEMS=="usb", GOTO="tty_end" +SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=usb" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" + LABEL="tty_end" -- 2.30.2