From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Feb 2014 11:52:28 +0000 (+0100)
Subject: Move enabling nf_conntrack_acct where it should be.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1108a15cc6d6da291fa6039ae92b3922dd8a2577

Move enabling nf_conntrack_acct where it should be.
---

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index df3ef5f96..d6a2f7504 100644
--- 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 88ac086e1..6b49274eb 100644
--- 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