On Tue, Feb 09, 2021 at 10:50:31AM -0700, Jim Fehlig wrote:
> 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@xxxxxxxx>
> ---
> src/remote/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 += {
Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
