aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-07-13 02:32:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-07-13 02:32:32 +0000
commit07db8f80f978419f90f1b85645577c2550140d0c (patch)
treed37cfd506016c8554f61d755115fd05ed829c3b7
parentbf8231a7691e3c921ff4954bd882ef921c1c94f0 (diff)
downloadupstream-07db8f80f978419f90f1b85645577c2550140d0c.tar.gz
upstream-07db8f80f978419f90f1b85645577c2550140d0c.tar.bz2
upstream-07db8f80f978419f90f1b85645577c2550140d0c.zip
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
-rw-r--r--package/base-files/files/etc/hotplug2-init.rules5
-rw-r--r--package/hotplug2/files/hotplug2.rules5
2 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/files/etc/hotplug2-init.rules b/package/base-files/files/etc/hotplug2-init.rules
index bcc4c6a9ec..acfe8ca509 100644
--- 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 a6697ae86d..4eb762fb01 100644
--- 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%;