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=11277b7d6fa0a97d569fd4b704018d075d8403cb;hp=2e63e140cb1fb6d6d4aed10e1fb3300f89778499;hb=c50e4f95d8cfcd21bde2b0d1ff24b4de8fef4976;hpb=6df831f25ebc9f55cd939f04392dad9237706e45

diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index 2e63e140c..11277b7d6 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -3,12 +3,10 @@
 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", 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}="pci-db"
 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="tty_end"