Merge branch 'master' into fifteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / fifteen / update.sh

diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index 1e5521229e92c95fa75474deafbda9d9a894e21c..3ea5ec596b32e3c251c1512367c22fecf3b26002 100644 (file)
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -44,6 +44,14 @@ extract_files
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old initscripts
+rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
+rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
+
+# Remove old CGI files
+rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
+
 # Convert firewall configuration
 /usr/bin/convert-xtaccess
 /usr/bin/convert-outgoingfw