gentoo-overlay/app-emulation/libvirt/files/libvirt-9.9.0-do-not-use-sysconfig.patch

From bdc0f6b9c91615c601ea3a625220097f5cb0eeb0 Mon Sep 17 00:00:00 2001
Message-ID: <bdc0f6b9c91615c601ea3a625220097f5cb0eeb0.1696413637.git.mprivozn@redhat.com>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 2 Mar 2022 10:01:04 +0100
Subject: [PATCH] libvirt-9.9.0-do-not-use-sysconfig.patch

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/locking/virtlockd.service.in | 1 -
 src/logging/virtlogd.service.in  | 1 -
 src/remote/libvirtd.service.in   | 1 -
 src/virtd.service.in             | 1 -
 tools/libvirt-guests.service.in  | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index ce00b6def9..9dee9189db 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -10,7 +10,6 @@ After=virtlockd-admin.socket
 [Service]
 Type=notify
 Environment=VIRTLOCKD_ARGS=
-EnvironmentFile=-@initconfdir@/virtlockd
 ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
 # Losing the locks is a really bad thing that will
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 52c9e5bb9e..90c63f0483 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -10,7 +10,6 @@ After=virtlogd-admin.socket
 [Service]
 Type=notify
 Environment=VIRTLOGD_ARGS=
-EnvironmentFile=-@initconfdir@/virtlogd
 ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
 ExecReload=/bin/kill -USR1 $MAINPID
 # Losing the logs is a really bad thing that will
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 24a6712b75..e4b4a189e1 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -28,7 +28,6 @@ Conflicts=xendomains.service
 [Service]
 Type=notify
 Environment=LIBVIRTD_ARGS="--timeout 120"
-EnvironmentFile=-@initconfdir@/libvirtd
 ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
diff --git a/src/virtd.service.in b/src/virtd.service.in
index 651a8d82d7..b87c7e0553 100644
--- a/src/virtd.service.in
+++ b/src/virtd.service.in
@@ -17,7 +17,6 @@ After=apparmor.service
 [Service]
 Type=notify
 Environment=@SERVICE@_ARGS="--timeout 120"
-EnvironmentFile=-@initconfdir@/@service@
 ExecStart=@sbindir@/@service@ $@SERVICE@_ARGS
 ExecReload=/bin/kill -HUP $MAINPID
 Restart=on-failure
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
index c547218f2a..f5a1a60abe 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -14,7 +14,7 @@ Documentation=man:libvirt-guests(8)
 Documentation=https://libvirt.org
 
 [Service]
-EnvironmentFile=-@initconfdir@/libvirt-guests
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
 # Hack just call traditional service until we factor
 # out the code
 ExecStart=@libexecdir@/libvirt-guests.sh start
-- 
2.41.0