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 353b6168ca36688293eb2e895ebba3de1a2ce178..ab268092ae4f9869e49d68b5e90f35c57567d154 100644 (file)
--- 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 9c7e3ac11e2a67dd732ce432c4e9cc73d004c974..7f27a65a8cb6c589678cfb7545de230b1eff9335 100644 (file)
--- 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