large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

[openwrt/openwrt.git] / openwrt / package / base-files / default / sbin / hotplug

diff --git a/openwrt/package/base-files/default/sbin/hotplug b/openwrt/package/base-files/default/sbin/hotplug
index 3500f75201947e2f049008fb94089832aec968f5..106299343a31f42bf4da094ed77a758bdbe18dff 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/hotplug
+++ b/openwrt/package/base-files/default/sbin/hotplug
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+# bypass the normal hotplug path for firmware loading
+# would otherwise cause problems with drivers like bcm43xx
 [ "$1" = "firmware" -a "$ACTION" = "add" ] && {
        [ -f "/lib/firmware/$FIRMWARE" ] && {
                echo 1 > "/sys$DEVPATH/loading"
@@ -8,13 +11,8 @@
        exit 0
 }
 
-[ -e /tmp/.failsafe ] && {
-       export FAILSAFE=true
-} || {
-       [ -e /etc/config/network ] && . /etc/config/network
-}
 . /etc/functions.sh
-. /etc/network.overrides
+. /etc/config/network
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin
 LOGNAME=root