Set nf_sip disbled as default.

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index a960e8343df0e5c6ac52f19ac5650b1548dffcfa..c34e7259e2332067c0f16fcc5345ad2ed58bac79 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -61,6 +61,7 @@ var/ipfire/logging
 var/ipfire/mac
 #var/ipfire/mac/settings
 var/ipfire/main
+#var/ipfire/main/disable_nf_sip
 #var/ipfire/main/hosts
 #var/ipfire/main/settings
 #var/ipfire/menu.d

diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files
index aad801010acff7bfacd4c317bbd9b481f2bbe08e..5ad59bb3c9ee92dc89a538eb9dcd34e44de70a42 100644 (file)
--- a/config/rootfiles/core/38/filelists/files
+++ b/config/rootfiles/core/38/filelists/files
@@ -18,6 +18,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
 var/ipfire/langs/fr.pl
+var/ipfire/main/disable_nf_sip
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/network

diff --git a/lfs/configroot b/lfs/configroot
index 6b6b79847911f887cdb3449b4d9c6bbb3afc66ad..c337ab0a7e870b46f9992b6fd1354455a8e27f05 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -65,7 +65,7 @@ $(TARGET) :
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
-           isdn/settings mac/settings main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
+           isdn/settings mac/settings main/disable_nf_sip main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \