Merge remote-tracking branch 'teissler/bug_10454' into next

This commit is contained in:
Michael Tremer
2014-09-28 13:31:53 +02:00

View File

@@ -18,7 +18,6 @@ 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}"
@@ -26,7 +25,7 @@ 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
@@ -68,7 +67,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)