Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

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

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 9c7e3ac11e2a67dd732ce432c4e9cc73d004c974..9ff2200115c4b425b384be228efba0014f2b6eba 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -27,7 +27,17 @@ init_networking() {
        done
        (exit ${failed})
        evaluate_retval
-                        
+
+       # Enable netfilter accounting
+       sysctl net.netfilter.nf_conntrack_acct=1 > /dev/null
+
+       if [ -e /var/ipfire/main/disable_nf_sip ]; then
+               rmmod nf_nat_sip
+               rmmod nf_conntrack_sip
+               rmmod nf_nat_h323
+               rmmod nf_conntrack_h323
+       fi
+
        boot_mesg "Setting up firewall"
        /etc/rc.d/init.d/firewall start; evaluate_retval
 
@@ -46,6 +56,7 @@ init_networking() {
        fi
 
        /etc/rc.d/init.d/dnsmasq start
+       /etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"