From: Jim Fehlig <jfehlig@suse.com>
Date: Tue, 9 Feb 2021 15:55:41 +0000 (-0700)
Subject: build: Fix generation of virtproxyd socket files
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e3d60f761c7fc1c254e39ea8e42161698c0ee7b5;p=libvirt.git

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>
---

diff --git a/src/remote/meson.build b/src/remote/meson.build
index 9ad2f6ab1c..0a188268b5 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE')
       'name': 'Libvirt proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
-      'deps': libvirtd_socket_conflicts,
+      'deps': 'Conflicts=' + libvirtd_socket_conflicts,
     }
 
     openrc_init_files += {