[libvirt] [PATCH 2/2] lockd: Install the admin sockets

[Daniel P. Berrangé]

On Tue, Feb 06, 2018 at 01:56:26PM -0500, John Ferlan wrote:
> Commit id 'ce7ae55e' added support for the lockd admin socket, but
> forgot to add the socket to the make and spec files for installation
> purposes.
> 
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>  libvirt.spec.in |  8 ++++++--
>  src/Makefile.am | 19 +++++++++++++++----
>  2 files changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index d94031067..44f846a16 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1520,7 +1520,7 @@ exit 0
>  
>  %if %{with_systemd}
>      %if %{with_systemd_macros}
> -        %systemd_post virtlockd.socket \
> +        %systemd_post virtlockd.socket virtlockd-admin.socket \
>              virtlogd.socket virtlogd-admin.socket \
>              libvirtd.service
>      %else
> @@ -1528,6 +1528,7 @@ if [ $1 -eq 1 ] ; then
>      # Initial installation
>      /bin/systemctl enable \
>          virtlockd.socket \
> +        virtlockd-admin.socket \
>          virtlogd.socket \
>          virtlogd-admin.socket \
>          libvirtd.service >/dev/null 2>&1 || :
> @@ -1558,7 +1559,7 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
>      %if %{with_systemd_macros}
>          %systemd_preun libvirtd.service \
>              virtlogd.socket virtlogd-admin.socket virtlogd.service \
> -            virtlockd.socket virtlockd.service
> +            virtlockd.socket virtlockd-admin.socket virtlockd.service
>      %else
>  if [ $1 -eq 0 ] ; then
>      # Package removal, not upgrade
> @@ -1568,6 +1569,7 @@ if [ $1 -eq 0 ] ; then
>          virtlogd-admin.socket \
>          virtlogd.service \
>          virtlockd.socket \
> +        virtlockd-admin.socket \
>          virtlockd.service > /dev/null 2>&1 || :
>      /bin/systemctl stop \
>          libvirtd.service \
> @@ -1575,6 +1577,7 @@ if [ $1 -eq 0 ] ; then
>          virtlogd-admin.socket \
>          virtlogd.service \
>          virtlockd.socket \
> +        virtlockd-admin.socket \
>          virtlockd.service > /dev/null 2>&1 || :
>  fi
>      %endif
> @@ -1830,6 +1833,7 @@ exit 0
>  %{_unitdir}/virtlogd-admin.socket
>  %{_unitdir}/virtlockd.service
>  %{_unitdir}/virtlockd.socket
> +%{_unitdir}/virtlockd-admin.socket
>  %else
>  %{_sysconfdir}/rc.d/init.d/libvirtd
>  %{_sysconfdir}/rc.d/init.d/virtlogd
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 3d7b8f7c3..64ffcd98d 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -2805,6 +2805,7 @@ MAINTAINERCLEANFILES += $(MANINFILES)
>  EXTRA_DIST += \
>          locking/virtlockd.service.in \
>          locking/virtlockd.socket.in \
> +        locking/virtlockd-admin.socket.in \
>          locking/virtlockd.aug \
>          locking/virtlockd.conf \
>          locking/test_virtlockd.aug.in \
> @@ -2824,12 +2825,12 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
>  
>  SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
>  
> -BUILT_SOURCES += virtlockd.service virtlockd.socket \
> +BUILT_SOURCES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
>  		 virtlogd.service virtlogd.socket virtlogd-admin.socket
> -DISTCLEANFILES += virtlockd.service virtlockd.socket \
> +DISTCLEANFILES += virtlockd.service virtlockd.socket virtlockd-admin.socket \
>  		  virtlogd.service virtlogd.socket virtlogd-admin.socket
>  
> -install-systemd: virtlockd.service virtlockd.socket \
> +install-systemd: virtlockd.service virtlockd.socket virtlockd-admin.socket \
>                   virtlogd.service virtlogd.socket virtlogd-admin.socket \
>  		 install-sysconfig
>  	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
> @@ -2837,6 +2838,8 @@ install-systemd: virtlockd.service virtlockd.socket \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
>  	$(INSTALL_DATA) virtlockd.socket \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
> +	$(INSTALL_DATA) virtlockd-admin.socket \
> +	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
>  	$(INSTALL_DATA) virtlogd.service \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
>  	$(INSTALL_DATA) virtlogd.socket \
> @@ -2846,7 +2849,8 @@ install-systemd: virtlockd.service virtlockd.socket \
>  
>  uninstall-systemd: uninstall-sysconfig
>  	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.service \
> -	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket
> +	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd.socket \
> +	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlockd-admin.socket
>  	rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.service \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd.socket \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/virtlogd-admin.socket
> @@ -2872,6 +2876,13 @@ virtlockd.socket: locking/virtlockd.socket.in $(top_builddir)/config.status
>  	    < $< > $@-t && \
>  	    mv $@-t $@
>  
> +virtlockd-admin.socket: locking/virtlockd-admin.socket.in \
> +                        $(top_builddir)/config.status
> +	$(AM_V_GEN)sed \
> +	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
> +	    < $< > $@-t && \
> +	    mv $@-t $@
> +
>  virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
>  	$(AM_V_GEN)sed \
>  	    -e 's|[@]sbindir[@]|$(sbindir)|g' \

Reviewed-by: Daniel P. Berrange <berrange at redhat.com>

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