core160: apply ssh config, start/stop IPSec and set need_reboot flag

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/160/update.sh b/config/rootfiles/core/160/update.sh
index d422b24aa587ff4a33f31f7cdde7c857e45ec998..a8a8ee30715048a144d3051b607fbc2c9b6dcbb5 100644 (file)
--- a/config/rootfiles/core/160/update.sh
+++ b/config/rootfiles/core/160/update.sh
@@ -38,6 +38,7 @@ rm -vf /sbin/regdbdump
 rm -vf /usr/lib/libreg.so
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Extract files
 extract_files
@@ -54,10 +55,17 @@ telinit u
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
+/etc/init.d/sshd restart
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+       /etc/init.d/ipsec start
+fi
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start