Move enabling nf_conntrack_acct where it should be.

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index df3ef5f96a08543d78d93abe1adade575766e0a2..d6a2f75048123728f5b44b7a245d200761e67c5f 100644 (file)
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -28,3 +28,6 @@ vm.min_free_kbytes = 8192
 # Disable IPv6 by default.
 net.ipv6.conf.all.disable_ipv6 = 1
 net.ipv6.conf.default.disable_ipv6 = 1
+
+# Enable netfilter accounting
+net.netfilter.nf_conntrack_acct=1

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 88ac086e1f38022d6341b80174a2db468f6c67de..6b49274eb62d98a5832aeb781fc8ea2504582a70 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -28,9 +28,6 @@ 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