don't load config files in failsafe mode

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

diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index 3d81364..c46fff6 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -1,6 +1,9 @@
 #!/bin/ash
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
+. /etc/network.overrides
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+
 type=$1
 debug "### ifup $type ###"
 
@@ -12,6 +15,9 @@ if_valid $if || exit
 mac=$(nvram get ${type}_hwaddr)
 $DEBUG ifconfig $if down 2>&-
 
+pidfile=/var/run/${if}.pid
+[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+
 if [ "${if%%[0-9]}" = "br" ]; then
        stp=$(nvram get ${type}_stp)
        $DEBUG brctl delbr $if 2>&-
@@ -47,7 +53,6 @@ case "$if_proto" in
        ;;
        dhcp)
                ip=$(nvram get ${type}_ipaddr)
-               [ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
                ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
        ;;
        none|"")