Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 64be6d3e6af5bb8b480143ddab1b41b877fd1308..228ada4e460527028be43a437410d7b1ad6bf4a3 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -48,6 +48,10 @@ extract_files
 sed "s|MAILTO=root|MAILTO=|g" < /var/spool/cron/root.orig > /var/tmp/root.tmp
 fcrontab /var/tmp/root.tmp
 
+# Disable snort packet decoding alerts
+sed -i "s|#config disable_decode_alerts|config disable_decode_alerts|g" /etc/snort/snort.conf
+sed -i "s|#config disable_tcpopt_alerts|config disable_tcpopt_alerts|g" /etc/snort/snort.conf
+
 #
 #Start services
 echo Starting Proxy