summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-07-21 16:32:43 +0200
committerKay Sievers <kay@vrfy.org>2013-07-21 16:33:27 +0200
commit44affdc5fd20f812c25bc9d2b1a9fc04215274a1 (patch)
tree69a23ef3bebe7350ba2ff426fb48f9be8a9e2937 /rules
parent3c475ce44e6b3b5bd6b22cff11a1322dabd95ba0 (diff)
rules: net, tty description - ask hwdb explicitly for pci data
Diffstat (limited to 'rules')
-rw-r--r--rules/75-net-description.rules4
-rw-r--r--rules/75-tty-description.rules3
2 files changed, 3 insertions, 4 deletions
diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index fe9fca14d..7e62f8b26 100644
--- a/rules/75-net-description.rules
+++ b/rules/75-net-description.rules
@@ -4,11 +4,11 @@ ACTION=="remove", GOTO="net_end"
SUBSYSTEM!="net", GOTO="net_end"
IMPORT{builtin}="net_id"
+
SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEMS=="usb", GOTO="net_end"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
-
-IMPORT{builtin}="hwdb"
+SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
LABEL="net_end"
diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index 83083d93e..11277b7d6 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -7,7 +7,6 @@ SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=u
SUBSYSTEMS=="usb", GOTO="tty_end"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
-
-IMPORT{builtin}="hwdb"
+SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
LABEL="tty_end"