diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/75-net-description.rules | 8 | ||||
| -rw-r--r-- | rules/75-tty-description.rules | 6 |
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" |