From 977007bfd9b463e9c6418ccf1547dee0944cc82b Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 20 Apr 2016 16:22:31 +0100 Subject: [PATCH] core101: Migrate conntrack settings that broke in 100 Signed-off-by: Michael Tremer --- config/rootfiles/core/101/update.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh index f44847465e..eb81d6106b 100644 --- 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 -- 2.39.5