From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 13:44:17 +0000 (+0200)
Subject: Disable vpn-watch.
X-Git-Tag: v2.13-beta1~168^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b871af81ed08222d92d98a8e7576b3f7386d5e92;p=people%2Fms%2Fipfire-2.x.git

Disable vpn-watch.
---

diff --git a/config/rootfiles/core/strongswan/filelists/files b/config/rootfiles/core/strongswan/filelists/files
index 409e5fe8ac..8df0b5d0bc 100644
--- a/config/rootfiles/core/strongswan/filelists/files
+++ b/config/rootfiles/core/strongswan/filelists/files
@@ -1,2 +1,3 @@
 etc/system-release
 etc/issue
+usr/local/bin/vpn-watch
diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 7eae873cea..c32dc3c06b 100755
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -7,6 +7,11 @@
 #                                                #
 ##################################################
 
+# XXX The vpn-watch daemon is disabled, because
+# apparently, it is not needed anymore after
+# strongswan has abandoned pluto.
+exit(0);
+
 use strict;
 
 require '/var/ipfire/general-functions.pl';