rules: net, tty description - ask hwdb explicitly for pci data

diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index fe9fca14db5e6d5af11da40bfe3a9934ea359e2b..7e62f8b26b79c16335fa582274be50fb87defe24 100644 (file)
--- 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"
 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}"
 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"
 
 LABEL="net_end"

diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index 83083d93ea29202f4e0c484b0e8697964dff94b0..11277b7d6fa0a97d569fd4b704018d075d8403cb 100644 (file)
--- 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}"
 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"
 
 LABEL="tty_end"