move firmware loading to hotplug2-init.rules (should fix #2056)

SVN-Revision: 7955

diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index bcc4c6a9ece2fe9b3be5615b0f69f62c442a38ae..acfe8ca509db02daf7cfe62708d84978806be553 100644 (file)
--- a/package/base-files/files/etc/hotplug2-init.rules
+++ b/package/base-files/files/etc/hotplug2-init.rules
@@ -28,6 +28,11 @@ DEVPATH is set {
        makedev /dev/%DEVICENAME% 0644
 }
 
+FIRMWARE is set {
+       nothrottle
+       exec /sbin/hotplug-call firmware;
+       next
+}
 
 SUBSYSTEM ~~ button {
        exec kill -USR1 1 ;

diff --git a/package/hotplug2/files/hotplug2.rules b/package/hotplug2/files/hotplug2.rules
index a6697ae86d5e585ee391c07cbf0e7f546f93ef05..4eb762fb011aadaf681a9e75e8450b288ac23aaf 100644 (file)
--- a/package/hotplug2/files/hotplug2.rules
+++ b/package/hotplug2/files/hotplug2.rules
@@ -1,9 +1,4 @@
 $include /etc/hotplug2-init.rules
-FIRMWARE is set {
-       nothrottle
-       exec /sbin/hotplug-call firmware;
-       next
-}
 
 SUBSYSTEM ~~ (net|button|usb) {
        exec /sbin/hotplug-call %SUBSYSTEM%;