Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 45 / update.sh

diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh
index 69b61e367ae23da8c30dc50fd4134362a7d83d7f..b7af7c9c0e72655397a2534d3df7eb6ab95ef63b 100644 (file)
--- a/config/rootfiles/core/45/update.sh
+++ b/config/rootfiles/core/45/update.sh
@@ -54,8 +54,10 @@ echo Starting Proxy
 /etc/init.d/squid start 2>/dev/null
 echo Rewriting Outgoing FW Rules
 /var/ipfire/outgoing/bin/outgoingfw.pl
-echo Starting vpn-watch
-/usr/local/bin/vpn-watch &
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       echo Starting vpn-watch
+       /usr/local/bin/vpn-watch &
+fi
 
 #
 #Update Language cache