From bf7cd8a9f0de150e5c320354cb35d9977d6e3117 Mon Sep 17 00:00:00 2001
From: Remi Bergsma <rbergsma@schubergphilis.com>
Date: Mon, 8 Dec 2014 18:53:18 +0100
Subject: [PATCH] remove biglock usage from ipsectunnel.sh

Biglock breaks creating VPN's when other scripts run at the
same time that also use the same biglock. These other scripts
do nothing that could harm our deployment and even multiple
vpn's can safely be created simultaniously.

(cherry picked from commit 8b412ce194eaf195dc77531379687de43e14a088)
---
 .../debian/config/opt/cloud/bin/ipsectunnel.sh      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
index e20c10f9e6d..9aa3f898666 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh
@@ -18,13 +18,6 @@
 
 source /root/func.sh
 
-lock="biglock"
-locked=$(getLockFile $lock)
-if [ "$locked" != "1" ]
-then
-    exit 1
-fi
-
 vpnconfdir="/etc/ipsec.d"
 vpnoutmark="0x525"
 vpninmark="0x524"
@@ -262,7 +255,7 @@ do
   p)    passive=1
         ;;
   ?)    usage
-        unlock_exit 2 $lock $locked
+        exit 2
         ;;
   esac
 done
@@ -301,7 +294,7 @@ then
     ret=$?
 else
     printf "Invalid action specified, must choose -A or -D to add/del tunnels\n" >&2
-    unlock_exit 5 $lock $locked
+    exit 5
 fi
 
-unlock_exit $ret $lock $locked
+exit $ret