core: use a bit more PID_FMT

[elogind.git] / rules / 75-net-description.rules

diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules
index 4437a34edaa085a6bf96440feb524b5295d8a46e..7e62f8b26b79c16335fa582274be50fb87defe24 100644 (file)
--- 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"
-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}"
+SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=pci"
 
 LABEL="net_end"