From 48876459cb9ffcace663ef0b3d7724f044fc1b12 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 31 Dec 2014 17:01:51 +0100
Subject: [PATCH] Daemon: do not wait for lock on restart

---
 data/PVE/Daemon.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/PVE/Daemon.pm b/data/PVE/Daemon.pm
index 6bd9c29..94dedfc 100644
--- a/data/PVE/Daemon.pm
+++ b/data/PVE/Daemon.pm
@@ -65,12 +65,15 @@ my $lockpidfile = sub {
 
     my $lkfn = $self->{pidfile} . ".lock";
 
+    my $waittime = 0;
+
     if (my $fd = $self->{env_pve_lock_fd}) {
 
 	$self->{daemon_lock_fh} = IO::Handle->new_from_fd($fd, "a");
-    
+	
     } else {
 
+	$waittime = 5;
 	$self->{daemon_lock_fh} = IO::File->new(">>$lkfn");
     }
 
@@ -78,7 +81,7 @@ my $lockpidfile = sub {
 	die "can't open lock '$lkfn' - $!\n";
     }
 
-    for (my $i = 0; $i < 5; $i ++) {
+    for (my $i = 0; $i < $waittime; $i ++) {
 	return if flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB);
 	sleep(1);
     }
-- 
2.39.2