summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-11-09 12:37:40 +0100
committerKay Sievers <kay@vrfy.org>2012-11-09 13:05:19 +0100
commita660c63c551b88136ac6176855b5907cc533e848 (patch)
treee57b8ba16d49ecd31bd84ee80dbffd52ddc76007 /rules
parent59803c380d3c0ec9d0ec1e4b9d99f0e4e9bb4aef (diff)
udev: net_id - add builtin to retrieve data for network devices
Diffstat (limited to 'rules')
-rw-r--r--rules/75-net-description.rules8
-rw-r--r--rules/75-tty-description.rules6
2 files changed, 6 insertions, 8 deletions
diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index b127757d0c..fe9fca14db 100644
--- a/rules/75-net-description.rules
+++ b/rules/75-net-description.rules
@@ -3,12 +3,12 @@
ACTION=="remove", GOTO="net_end"
SUBSYSTEM!="net", GOTO="net_end"
-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}"
+IMPORT{builtin}="net_id"
+SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEMS=="usb", GOTO="net_end"
-IMPORT{builtin}="hwdb"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
+IMPORT{builtin}="hwdb"
+
LABEL="net_end"
diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index bfa6de39e9..83083d93ea 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -3,13 +3,11 @@
ACTION=="remove", GOTO="tty_end"
SUBSYSTEM!="tty", GOTO="tty_end"
-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", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
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}"
+IMPORT{builtin}="hwdb"
LABEL="tty_end"