Core Update 168: Ship and restart OpenSSH

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

diff --git a/config/rootfiles/core/168/update.sh b/config/rootfiles/core/168/update.sh
index 5250ea3b28029d44cac8bd7bf848fe40519d78ec..44464725b4bc4dc7dd95da5c79f77905cfe0e937 100644 (file)
--- a/config/rootfiles/core/168/update.sh
+++ b/config/rootfiles/core/168/update.sh
@@ -47,7 +47,22 @@ rm -rvf \
        /usr/lib/libsolvext.so* \
        /usr/sbin/dnet
 
+# Remove netbpm add-on, if installed
+if [ -e "/opt/pakfire/db/installed/meta-netbpm" ]; then
+       for i in $(</opt/pakfire/db/rootfiles/netbpm); do
+               rm -rfv "/${i}"
+       done
+fi
+rm -vf \
+       /opt/pakfire/db/installed/meta-netbpm \
+       /opt/pakfire/db/meta/meta-netbpm \
+       /opt/pakfire/db/rootfiles/netbpm
+
 # Stop services
+/etc/init.d/squid stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
+/etc/init.d/suricata stop
 
 # Extract files
 extract_files
@@ -61,7 +76,16 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
+/etc/init.d/sshd restart
+/etc/init.d/vnstatd restart
+/etc/init.d/squid start
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
+/etc/init.d/suricata start
 
 # This update needs a reboot...
 #touch /var/run/need_reboot