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
commitc50816d0931cd0b5d1ed893dfdda580debd29e92 (patch)
tree0f10a95bce6f9e043bf26b209b9eb441e5143b03
parent45957754164eed31cf272f96d22c4817aed14299 (diff)
downloadupstream-c50816d0931cd0b5d1ed893dfdda580debd29e92.tar.gz
upstream-c50816d0931cd0b5d1ed893dfdda580debd29e92.tar.bz2
upstream-c50816d0931cd0b5d1ed893dfdda580debd29e92.zip
move firmware loading to hotplug2-init.rules (should fix #2056)
SVN-Revision: 7955
-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%;