units: for all unit settings that take lists, allow the empty string for resetting...

[elogind.git] / rules / 50-udev-default.rules

diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 758538caeb323f4940f3225d6644564964e0de4e..fc52fd17f5871f361b02eaf51c493a594cdfc803 100644 (file)
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -43,7 +43,7 @@ SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
 
 # 'libusb' device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
 
 # printer
 KERNEL=="parport[0-9]*", GROUP="lp"
@@ -86,3 +86,5 @@ KERNEL=="fuse", ACTION=="add", MODE="0666", OPTIONS+="static_node=fuse"
 SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644", SYMLINK+="rtc"
 
 SUBSYSTEM=="firmware", ACTION=="add", IMPORT{builtin}="firmware"
+
+ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"