core101: Migrate conntrack settings that broke in 100

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
index f44847465eab4635b4e2f6b8a313f68646379cb2..eb81d6106b36a761bf6e23820955c60b0d56caa2 100644 (file)
--- a/config/rootfiles/core/101/update.sh
+++ b/config/rootfiles/core/101/update.sh
@@ -50,6 +50,22 @@ extract_files
 # update linker config
 ldconfig
 
+# Fix conntrack configuration
+for i in CONNTRACK_H323 CONNTRACK_FTP CONNTRACK_PPTP CONNTRACK_TFTP CONNTRACK_IRC; do
+       if ! grep -q "^${i}" /var/ipfire/optionsfw/settings; then
+               echo "${i}=on"
+       fi
+done >> /var/ipfire/optionsfw/settings
+
+# Special handling for SIP
+if ! grep -q "^CONNTRACK_SIP" /var/ipfire/optionsfw/settings; then
+       if [ -e "/var/ipfire/main/disable_nf_sip" ]; then
+               echo "CONNTRACK_SIP=off" >> /var/ipfire/optionsfw/settings
+               rm -f /var/ipfire/main/disable_nf_sip
+       else
+               echo "CONNTRACK_SIP=on" >> /var/ipfire/optionsfw/settings
+       fi
+fi
 
 # Update Language cache
 #/usr/local/bin/update-lang-cache