X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2F75-net-description.rules;h=b127757d0c744cd603236b8bec05d281bc600c3e;hp=ce57d48e868906ce63c63ed06f757da10c6c1925;hb=f17491e27d5a4258516249a0369b95a0e1544ab8;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed diff --git a/rules/75-net-description.rules b/rules/75-net-description.rules index ce57d48e8..b127757d0 100644 --- 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" SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" -SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db" +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" -SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db" +IMPORT{builtin}="hwdb" SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}" LABEL="net_end"