From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 15 May 2010 17:41:55 +0000 (+0200)
Subject: Add an config setting to remove netfilter sip modules.
X-Git-Tag: v2.9-beta1~307
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3a90a80c2b88e0d6e3aa403a7b655cf3bb141bc0

Add an config setting to remove netfilter sip modules.
---

diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
index 353b6168ca..ab268092ae 100644
--- a/config/rootfiles/core/38/filelists/files
+++ b/config/rootfiles/core/38/filelists/files
@@ -18,6 +18,7 @@ var/ipfire/langs/en.pl
 var/ipfire/langs/fr.pl
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/ipsec
+etc/rc.d/init.d/network
 etc/rc.d/init.d/ntp
 etc/rc.d/init.d/modules
 usr/local/bin/ipsecctrl
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 9c7e3ac11e..7f27a65a8c 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -27,7 +27,12 @@ init_networking() {
 	done
 	(exit ${failed})
 	evaluate_retval
-                        
+
+	if [ -e /var/ipfire/main/disable_nf_sip ]; then
+		rmmod nf_nat_sip
+		rmmod nf_conntrack_sip
+	fi
+
 	boot_mesg "Setting up firewall"
 	/etc/rc.d/init.d/firewall start; evaluate_retval