Activate build dir overrides in libvirtd, virtlockd, virsh & tests

Add calls to virFileActivateDirOverride so that the build dir
overrides are activated.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index e197db4407ddca431aa0ab6a4ad1642cdb894e83..b4e9c1ff7658fb737bbde7c6b6eec9373460dc82 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1156,6 +1156,8 @@ int main(int argc, char **argv) {
 
     virUpdateSelfLastChanged(argv[0]);
 
+    virFileActivateDirOverride(argv[0]);
+
     if (strstr(argv[0], "lt-libvirtd") ||
         strstr(argv[0], "/daemon/.libs/libvirtd")) {
         char *tmp = strrchr(argv[0], '/');

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 455cc88094011a7563994385ede643c8ecdab40f..969f901f7ff2397d6fb852611b99878d63b1af79 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -1271,6 +1271,8 @@ int main(int argc, char **argv) {
         }
     }
 
+    virFileActivateDirOverride(argv[0]);
+
     if (!(config = virLockDaemonConfigNew(privileged))) {
         VIR_ERROR(_("Can't create initial configuration"));
         exit(EXIT_FAILURE);

diff --git a/tests/testutils.c b/tests/testutils.c
index 9767a782f5fa5a5409173d31853289ba17ba1fbc..7d27582f5a43ffad4489d1f874ce15679efae9b6 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -678,6 +678,8 @@ int virtTestMain(int argc,
     char *oomstr;
 #endif
 
+    virFileActivateDirOverride(argv[0]);
+
     if (!virFileExists(abs_srcdir))
         return EXIT_AM_HARDFAIL;
 

diff --git a/tools/virsh.c b/tools/virsh.c
index 28af3c36e294ee6fd4ea100dfd76c56f3eb3ff65..15f30252d1fb554ff47b9be9b0e54a95ccafb06c 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -3594,6 +3594,8 @@ main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
+    virFileActivateDirOverride(argv[0]);
+
     if (!(progname = strrchr(argv[0], '/')))
         progname = argv[0];
     else