From: Kay Sievers <kay@vrfy.org>
Date: Thu, 25 Oct 2012 19:33:22 +0000 (+0200)
Subject: rules: call 'hwdb' with --subsystem= where appropriate
X-Git-Tag: v196~238
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=15ce372b75a48f73cc3b0ca435b9d9df3ce0ea49

rules: call 'hwdb' with --subsystem= where appropriate
---

diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index 4437a34ed..b127757d0 100644
--- a/rules/75-net-description.rules
+++ b/rules/75-net-description.rules
@@ -4,7 +4,7 @@ ACTION=="remove", GOTO="net_end"
 SUBSYSTEM!="net", GOTO="net_end"
 
 SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb"
+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="net_end"
 
diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index 59857c2d2..c8ee376ba 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -5,7 +5,7 @@ SUBSYSTEM!="tty", GOTO="tty_end"
 
 IMPORT{builtin}="hwdb"
 
-SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
+SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id --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"