summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-10-25 21:33:22 +0200
committerKay Sievers <kay@vrfy.org>2012-10-25 21:44:33 +0200
commit15ce372b75a48f73cc3b0ca435b9d9df3ce0ea49 (patch)
treed54a6e7a3d15ada823b84fcaf2ae3cb1a9d3bbb2
parentudev: hwdb: add acpi/pnp vendor description file (diff)
downloadsystemd-15ce372b75a48f73cc3b0ca435b9d9df3ce0ea49.tar.xz
systemd-15ce372b75a48f73cc3b0ca435b9d9df3ce0ea49.zip
rules: call 'hwdb' with --subsystem= where appropriate
-rw-r--r--rules/75-net-description.rules2
-rw-r--r--rules/75-tty-description.rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index 4437a34eda..b127757d0c 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 59857c2d22..c8ee376baf 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"