core133: Ship updated vpnmain.cgi file and regenerate configuration

[ipfire-2.x.git] / config / rootfiles / core / 133 / update.sh

diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh
index 80622c42ac7e3c3c035761a79f6a5a67416e588d..9d708f0924b84b58ba0f76250c82534468d0adcb 100644 (file)
--- a/config/rootfiles/core/133/update.sh
+++ b/config/rootfiles/core/133/update.sh
@@ -31,8 +31,16 @@ for (( i=1; i<=$core; i++ )); do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# remove dropped packages
+for package in jansson; do
+       rm -f "/opt/pakfire/db/installed/meta-${package}"
+       rm -f "/opt/pakfire/db/meta/meta-${package}"
+       rm -f "/opt/pakfire/db/rootfiles/${package}"
+done
+
 # Stop services
 /etc/init.d/squid stop
+/usr/local/bin/ipsecctrl D
 
 # Extract files
 extract_files
@@ -45,12 +53,20 @@ chown nobody:nobody /var/ipfire/main/security
 # update linker config
 ldconfig
 
+# restart init after glibc update
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Regenerate /etc/ipsec.conf
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
 # Start services
+/usr/local/bin/ipsecctrl S
 /etc/init.d/suricata restart
 /etc/init.d/squid start
+/etc/init.d/collectd restart
 
 # Finish
 /etc/init.d/fireinfo start