Merge branch 'unbound' into next

[ipfire-2.x.git] / src / initscripts / init.d / network

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 5aecd1557d0742097fdf263a175ecc8b04da229d..b29ca2ca5b309f143cd9e1b9521dc635dbb31601 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -16,17 +16,12 @@
 . ${rc_functions}
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
-init_networking() {
-       /etc/rc.d/init.d/dnsmasq start
-       /etc/rc.d/init.d/static-routes start
-}
-
 DO="${1}"
 shift
 
 if [ -n "${1}" ]; then
        ALL=0
-       for i in green red blue orange; do      
+       for i in green red blue orange; do
                eval "${i}=0"
        done
 else
@@ -47,8 +42,6 @@ done
 
 case "${DO}" in
        start)
-               [ "${ALL}" == "1" ] && init_networking
-
                # Starting interfaces...
                # GREEN
                [ "$green" == "1" ] && /etc/rc.d/init.d/networking/green start
@@ -68,7 +61,9 @@ case "${DO}" in
                                rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
                                [ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
                        fi
-               fi                           
+               fi
+
+               /etc/rc.d/init.d/static-routes start
                ;;
 
        stop)
@@ -91,9 +86,6 @@ case "${DO}" in
                        fi
                fi
 
-               # Stopping dnsmasq if network all networks shutdown
-               [ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop
-
                exit 0
                ;;