generation of virtproxd socket files

[Daniel P. Berrangé]

On Mon, Feb 08, 2021 at 04:09:16PM -0700, Jim Fehlig wrote:
> Hi All,
> 
> I received a report [1] and verified that virtproxyd*.socket files have
> broken 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
> 
> virtproxyd.socket should 'Conflicts' with the libvirtd sockets. I suspect
> this regressed in the switch to meson. I checked a libvirt 6.0.0
> installation and indeed it has
> 
> Conflicts=libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
> libvirtd-tcp.socket libvirtd-tls.socket
> 
> I blame it on Monday and my mind stuck in the weekend, but I spent too much
> time trying to figure out how those socket files are generated before
> writing this mail. It would be much appreciated if someone can give me a
> nudge in the right direction :-).

The original src/remote/Makefile.inc.am code  did

        -e 's|[@]deps[@]|Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)|g' \

but src/remote/meson.build just does

   libvirtd_socket_conflicts = ' '.join(libvirtd_socket_unit_files)

so missing the "Conflicts=" part.


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