X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2F75-tty-description.rules;h=bfa6de39e935cbe7c2a5b7b704c2defc9e134485;hp=2e63e140cb1fb6d6d4aed10e1fb3300f89778499;hb=c3cfed0d6cd9f537aa998096a43b80e98d99c6c4;hpb=8e90942c7af2508f88c7284a0b116caf7ec854a9 diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules index 2e63e140c..bfa6de39e 100644 --- a/rules/75-tty-description.rules +++ b/rules/75-tty-description.rules @@ -4,11 +4,12 @@ ACTION=="remove", GOTO="tty_end" SUBSYSTEM!="tty", GOTO="tty_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="tty_end" -SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db" +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}" + LABEL="tty_end"