From c8579871a980e7cd41df50afad62e9c3183534c6 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 26 Nov 2019 15:28:22 +0100 Subject: [PATCH] all: don't wait for driver lock during startup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are two daemons that wait for acquiring their pid files: virtnetworkd and virtstoraged. This is undesirable as the idea is to quit early if unable to acquire the pid file. Fixes: v5.6.0-rc1~207. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko Reviewed-by: Daniel P. Berrangé --- src/network/bridge_driver.c | 2 +- src/storage/storage_driver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 07dba8cfe4..e360645969 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -761,7 +761,7 @@ networkStateInitialize(bool privileged, if ((network_driver->lockFD = virPidFileAcquire(network_driver->stateDir, "driver", - true, getpid())) < 0) + false, getpid())) < 0) goto error; /* if this fails now, it will be retried later with dnsmasqCapsRefresh() */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d8355d3c3c..580a5e6f15 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -296,7 +296,7 @@ storageStateInitialize(bool privileged, if ((driver->lockFD = virPidFileAcquire(driver->stateDir, "driver", - true, getpid())) < 0) + false, getpid())) < 0) goto error; if (virStoragePoolObjLoadAllState(driver->pools, -- GitLab