From: Kay Sievers <kay@vrfy.org>
Date: Thu, 25 Oct 2012 20:17:05 +0000 (+0200)
Subject: rules: fix usb_id/hwdb mixup in tty-description.rules
X-Git-Tag: v196~233
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f17491e27d5a4258516249a0369b95a0e1544ab8

rules: fix usb_id/hwdb mixup in tty-description.rules

<grawity> btw, in 15ce372b75a "call 'hwdb' with --subsystem=" you
  actually added "usb_id --subsystem=usb" (75-tty-description.rules)
<kay> ouch :)
---

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"