From: Kay Sievers <kay@vrfy.org>
Date: Thu, 25 Oct 2012 19:34:46 +0000 (+0200)
Subject: rules: call hwdb for all devices with a 'modalias'
X-Git-Tag: v196~237
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f3b9526171eceb885c8365c46e11aa27e8cdad13

rules: call hwdb for all devices with a 'modalias'
---

diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 758538cae..fc52fd17f 100644
--- 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}"