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 1e48af94942cca5b43ef1d352f0fe9fd11eaf098..b29ca2ca5b309f143cd9e1b9521dc635dbb31601 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -16,11 +16,6 @@
 . ${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
 
@@ -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
@@ -69,6 +62,8 @@ case "${DO}" in
                                [ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
                        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
                ;;