From d51e4906648359f91e61ff74a0df35d77a0f0a24 Mon Sep 17 00:00:00 2001 From: Timo Eissler Date: Sat, 27 Sep 2014 23:16:57 +0200 Subject: [PATCH 1/2] network: fix coding style --- src/initscripts/init.d/network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 5aecd1557..1e48af949 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -26,7 +26,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 +68,7 @@ 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 ;; stop) From 1d4897f30894ad52a37072454ccf690c51e9a0b1 Mon Sep 17 00:00:00 2001 From: Timo Eissler Date: Sat, 27 Sep 2014 23:28:04 +0200 Subject: [PATCH 2/2] network: move start of static-routes Fixes #10454 Create static routes after network interfaces are initialised. --- src/initscripts/init.d/network | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network index 1e48af949..9182e9801 100644 --- a/src/initscripts/init.d/network +++ b/src/initscripts/init.d/network @@ -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}" @@ -69,6 +68,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)