[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9a818c0eb4fc801363e319e346876f2abc6a28a9

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9a818c0eb4fc801363e319e346876f2abc6a28a9

[git]

[-- Attachment #1: Type: text/plain, Size: 3325 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9a818c0eb4fc801363e319e346876f2abc6a28a9 (commit)
       via  09e08901093dfe3f0e9b37dd33f1b91b7d9fdcb3 (commit)
       via  1d4897f30894ad52a37072454ccf690c51e9a0b1 (commit)
       via  d51e4906648359f91e61ff74a0df35d77a0f0a24 (commit)
      from  478d8bb5dae9ccecbe4b92e9b1837409bbae6ad9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a818c0eb4fc801363e319e346876f2abc6a28a9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 28 13:32:17 2014 +0200

    core84: Add changed /etc/rc.d/init.d/network

commit 09e08901093dfe3f0e9b37dd33f1b91b7d9fdcb3
Merge: 478d8bb 1d4897f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Sep 28 13:31:53 2014 +0200

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

commit 1d4897f30894ad52a37072454ccf690c51e9a0b1
Author: Timo Eissler <timo(a)eissler.pro>
Date:   Sat Sep 27 23:28:04 2014 +0200

    network: move start of static-routes
    
    Fixes #10454
    
    Create static routes after network interfaces are initialised.

commit d51e4906648359f91e61ff74a0df35d77a0f0a24
Author: Timo Eissler <timo(a)eissler.pro>
Date:   Sat Sep 27 23:16:57 2014 +0200

    network: fix coding style

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/84/filelists/files | 1 +
 src/initscripts/init.d/network           | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/core/84/filelists/files
index 359fbe0..c26e2ea 100644
--- a/config/rootfiles/core/84/filelists/files
+++ b/config/rootfiles/core/84/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/network
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 5aecd15..9182e98 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}"
@@ -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)


hooks/post-receive
--
IPFire 2.x development tree