Merge remote-tracking branch 'origin/next' into thirteen

[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 7f27a65a8cb6c589678cfb7545de230b1eff9335..9ff2200115c4b425b384be228efba0014f2b6eba 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -28,9 +28,14 @@ init_networking() {
        (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"
@@ -51,6 +56,7 @@ init_networking() {
        fi
 
        /etc/rc.d/init.d/dnsmasq start
+       /etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"