Introduce two new functions to be used on locking.

- try_lock: used for trying to get an EXCLUSIVE lock for a specified timeout by default of 5
- unlock_force: which just releases any locks held on a specified lock

Use this new functions on rc.openvpn to avoid spurious stale locks around.

1 files changed, 7 insertions, 1 deletions

diff --git a/etc/rc.openvpn b/etc/rc.openvpn
index 4cabffe..f60ad56 100755
--- a/etc/rc.openvpn
+++ b/etc/rc.openvpn
@@ -80,7 +80,13 @@ if(is_array($config['openvpn']['openvpn-server']) || is_array($config['openvpn']
 } else
 	return;
 
-$openvpnlck = lock('openvpn', LOCK_EX);
+$openvpnlck = try_lock('openvpn', 10);
+if (!$openvpnlck) {
+	log_error(gettext("Could not obtain openvpn lock for executing rc.openvpn for more than 10 seconds continuing..."));
+	unlock_force('openvpn');
+	$openvpnlck = lock('openvpn', LOCK_EX);
+}
+
 $arg_array = explode(",",$argument);
 foreach ($arg_array as $arg_element) {
 	$gwgroups = array();