diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-25 11:57:56 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-08-25 11:57:56 +0000 |
| commit | 84e5ae23cefdd6c8c713483fe13fdcdba045de4e (patch) | |
| tree | 07e7d4047a111908686f61489039bd1b36f9d0f5 | |
| parent | c103b2f11109291453e70a429b202f39bed93aa1 (diff) | |
don't load config files in failsafe mode
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1750 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/default/etc/init.d/S40network | 2 | ||||
| -rwxr-xr-x | package/base-files/default/etc/init.d/S45firewall | 2 | ||||
| -rwxr-xr-x | package/base-files/default/etc/init.d/S50dnsmasq | 2 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifdown | 2 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifup | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network index c4226d343..df7c6b351 100755 --- a/package/base-files/default/etc/init.d/S40network +++ b/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/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall index c9986011a..066bded5b 100755 --- a/package/base-files/default/etc/init.d/S45firewall +++ b/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/package/base-files/default/etc/init.d/S50dnsmasq b/package/base-files/default/etc/init.d/S50dnsmasq index 31d0a3697..cce957573 100755 --- a/package/base-files/default/etc/init.d/S50dnsmasq +++ b/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/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 950ee12db..2d4054d8b 100755 --- a/package/base-files/default/sbin/ifdown +++ b/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/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index 6aa998713..c46fff65c 100755 --- a/package/base-files/default/sbin/ifup +++ b/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 ###" |