diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-08-25 11:57:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-08-25 11:57:56 +0000 |
| commit | e07a9f98817edcc4fd988ea72584474c3395c7e6 (patch) | |
| tree | 07e7d4047a111908686f61489039bd1b36f9d0f5 | |
| parent | 11c3087be1b791b933fbc031cdd0811a53cbd3e0 (diff) | |
| download | upstream-e07a9f98817edcc4fd988ea72584474c3395c7e6.tar.gz upstream-e07a9f98817edcc4fd988ea72584474c3395c7e6.tar.bz2 upstream-e07a9f98817edcc4fd988ea72584474c3395c7e6.zip | |
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 c4226d3437..df7c6b3515 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 c9986011ad..066bded5bf 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 31d0a36976..cce957573c 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 950ee12db5..2d4054d8b3 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 6aa998713c..c46fff65c3 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 ###" |