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 c4226d34370a08215d092e7b18b70a318d6bbf67..df7c6b351556a072228455ffbff8d6a37a329a16 100755 (executable)
--- 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 c9986011ad89d868fd82e286de3999c81e67f9e6..066bded5bf745b1cf6f8221348f551be3a72131c 100755 (executable)
--- 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 31d0a369767aaec76790aa23f89b5b6084f7952c..cce957573cf26f6c4769ffed0ec22cd3157058f7 100755 (executable)
--- 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 950ee12db57c17e20e80ee5934b3cbb6e51e2ac7..2d4054d8b3650a673cff2b425fe727ef2a0917e1 100755 (executable)
--- 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 6aa998713c8501270b65922e3a145cebbbab877c..c46fff65c346c8dbbe1dd07d45760a186f4398f8 100755 (executable)
--- 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 ###"