mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
954f91f737
After upstream commit of v12.2.0-10-g2db552dc6a [1] our
libvirt-12.1.0-do-not-use-sysconfig.patch does no longer apply
cleanly. Rebase it.
1: 2db552dc6a
Signed-off-by: Michal Privoznik <michal.privoznik@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/46072
Closes: https://github.com/gentoo/gentoo/pull/46072
Signed-off-by: Sam James <sam@gentoo.org>
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
From 0553ca64ebf88f307853db881c51c0b73674cab1 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <0553ca64ebf88f307853db881c51c0b73674cab1.1775668386.git.mprivozn@redhat.com>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Wed, 2 Mar 2022 10:01:04 +0100
|
|
Subject: [PATCH] libvirt-12.2.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 cd6c77c6af..1746f0e8c9 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
|
|
|
|
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
|
index bcc356f9d1..94d3be9dee 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
|
|
|
|
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
|
index b0a062e885..39a7a91a75 100644
|
|
--- a/src/remote/libvirtd.service.in
|
|
+++ b/src/remote/libvirtd.service.in
|
|
@@ -28,7 +28,6 @@ Conflicts=xendomains.service
|
|
[Service]
|
|
Type=notify-reload
|
|
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 7ffb77e339..92a48da90c 100644
|
|
--- a/src/virtd.service.in
|
|
+++ b/src/virtd.service.in
|
|
@@ -17,7 +17,6 @@ After=apparmor.service
|
|
[Service]
|
|
Type=notify-reload
|
|
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 c8e4d3d749..28f26e31ba 100644
|
|
--- a/tools/libvirt-guests.service.in
|
|
+++ b/tools/libvirt-guests.service.in
|
|
@@ -14,7 +14,7 @@ After=virtxend.socket
|
|
After=virt-guest-shutdown.target
|
|
|
|
[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.52.0
|
|
|