Core Update 171: Only start services if they are actually enabled

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 2c07d2f0877d92a97c0794d8032b628c875a19f1..8a6c197101d72a0dd4d92eaefe16a5b024550e44 100644 (file)
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -148,12 +148,18 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
-/etc/init.d/squid start
-/etc/init.d/openvpn start
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+       /etc/init.d/openvpn start
+fi
+
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec start
 fi
 
+if -f /var/ipfire/proxy/enable; then
+       /etc/init.d/squid start
+fi
+
 # This update needs a reboot...
 touch /var/run/need_reboot