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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7955 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index bcc4c6a..acfe8ca 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
 }
 
        makedev /dev/%DEVICENAME% 0644
 }
 

+FIRMWARE is set {
+       nothrottle
+       exec /sbin/hotplug-call firmware;
+       next
+}

 
 SUBSYSTEM ~~ button {
        exec kill -USR1 1 ;
 
 SUBSYSTEM ~~ button {
        exec kill -USR1 1 ;

diff --git a/package/hotplug2/files/hotplug2.rules b/package/hotplug2/files/hotplug2.rules
index a6697ae..4eb762f 100644 (file)
--- a/package/hotplug2/files/hotplug2.rules
+++ b/package/hotplug2/files/hotplug2.rules
@@ -1,9 +1,4 @@
 $include /etc/hotplug2-init.rules
 $include /etc/hotplug2-init.rules

-FIRMWARE is set {
-       nothrottle
-       exec /sbin/hotplug-call firmware;
-       next
-}

 
 SUBSYSTEM ~~ (net|button|usb) {
        exec /sbin/hotplug-call %SUBSYSTEM%;
 
 SUBSYSTEM ~~ (net|button|usb) {
        exec /sbin/hotplug-call %SUBSYSTEM%;