File libvirt.e3d60f761c7fc1c254e39ea8e42161698c0ee7b... of Package libvirt-7.0.0

Overview Repositories Revisions Requests Users Attributes Meta

File libvirt.e3d60f761c7fc1c254e39ea8e42161698c0ee7b5.patch of Package libvirt-7.0.0

From: Jim Fehlig <jfehlig@suse.com>
Date: Tue, 9 Feb 2021 08:55:41 -0700
Subject: e3d60f761c7fc1c254e39ea8e42161698c0ee7b5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

build: Fix generation of virtproxyd socket files

The various virtproxyd socket files are generated with invalid syntax,
e.g. from virtproxyd.socket

[Unit]
Description=Libvirt proxy local socket
Before=virtproxyd.service
libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket

Note the missing 'Conflicts=' in the last line. Fix it by prepending
'Conflicts=' to libvirtd_socket_conflicts when adding virtproxyd
to virt_daemon_units.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/remote/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -221,25 +221,25 @@ if conf.has('WITH_REMOTE')
 
     virt_daemon_confs += {
       'name': 'virtproxyd',
       'with_ip': true,
     }
 
     virt_daemon_units += {
       'service': 'virtproxyd',
       'service_in': files('virtproxyd.service.in'),
       'name': 'Libvirt proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
-      'deps': libvirtd_socket_conflicts,
+      'deps': 'Conflicts=' + libvirtd_socket_conflicts,
     }
 
     openrc_init_files += {
       'name': 'virtproxyd',
       'in_file': files('virtproxyd.init.in'),
       'confd': files('virtproxyd.confd'),
     }
 
     sysconf_files += {
       'name': 'virtproxyd',
       'file': files('virtproxyd.sysconf'),
     }

Places

File libvirt.e3d60f761c7fc1c254e39ea8e42161698c0ee7b5.patch of Package libvirt-7.0.0

Places