From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 25 Aug 2005 11:57:56 +0000 (+0000)
Subject: don't load config files in failsafe mode
X-Git-Tag: reboot~32155
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0201b83e8639c777f555d9aab3ead06e55178336;p=openwrt%2Fstaging%2Fblogic.git

don't load config files in failsafe mode

SVN-Revision: 1750
---

diff --git a/openwrt/package/base-files/default/etc/init.d/S40network b/openwrt/package/base-files/default/etc/init.d/S40network
index c4226d34370a..df7c6b351556 100755
--- a/openwrt/package/base-files/default/etc/init.d/S40network
+++ b/openwrt/package/base-files/default/etc/init.d/S40network
@@ -1,6 +1,6 @@
 #!/bin/sh
 . /etc/functions.sh
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 case "$1" in
   start|restart)
     ifup lan
diff --git a/openwrt/package/base-files/default/etc/init.d/S45firewall b/openwrt/package/base-files/default/etc/init.d/S45firewall
index c9986011ad89..066bded5bf74 100755
--- a/openwrt/package/base-files/default/etc/init.d/S45firewall
+++ b/openwrt/package/base-files/default/etc/init.d/S45firewall
@@ -5,7 +5,7 @@ ${FAILSAFE:+exit}
 
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 WAN=$(nvram get wan_ifname)
 LAN=$(nvram get lan_ifname)
diff --git a/openwrt/package/base-files/default/etc/init.d/S50dnsmasq b/openwrt/package/base-files/default/etc/init.d/S50dnsmasq
index 31d0a369767a..cce957573cf2 100755
--- a/openwrt/package/base-files/default/etc/init.d/S50dnsmasq
+++ b/openwrt/package/base-files/default/etc/init.d/S50dnsmasq
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 # interface to use for DHCP
 iface=lan
diff --git a/openwrt/package/base-files/default/sbin/ifdown b/openwrt/package/base-files/default/sbin/ifdown
index 950ee12db57c..2d4054d8b365 100755
--- a/openwrt/package/base-files/default/sbin/ifdown
+++ b/openwrt/package/base-files/default/sbin/ifdown
@@ -2,7 +2,7 @@
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 type=$1
 debug "### ifdown $type ###"
 if=$(nvram get ${type}_ifname)
diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index 6aa998713c85..c46fff65c346 100755
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -2,7 +2,7 @@
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 . /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
 
 type=$1
 debug "### ifup $type ###"