Fix restarting Squid and OpenVPN during Core Update 171

My fault, again. :-/

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 48fd742b567e09806d136af3c9ccd089fe819230..dd093e8563b1cf52403874e2a73a4d00cd43f543 100644 (file)
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -34,7 +34,8 @@ done
 # Stop services
 /etc/rc.d/init.d/apache stop
 /etc/rc.d/init.d/squid stop
-/etc/rc.d/init.d/openvpn stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 /etc/rc.d/init.d/ipsec stop
 
 # Remove files
@@ -151,12 +152,13 @@ ldconfig
 # Start services
 /etc/rc.d/init.d/apache start
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
-       /etc/init.d/openvpn start
+       /usr/local/bin/openvpnctrl -s
+       /usr/local/bin/openvpnctrl -sn2n
 fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec start
 fi
-if -f /var/ipfire/proxy/enable; then
+if [ -f /var/ipfire/proxy/enable ]; then
        /etc/init.d/squid start
 fi