[libvirt] [PATCH] No need to use a .in file for virtlockd.socket

[Jim Fehlig]

Guido Günther wrote:
> since there are no substitutions in it.
>   

Eric has since sent a patch that adds a substitution

https://www.redhat.com/archives/libvir-list/2013-January/msg00226.html

Regards,
Jim


> ---
>  src/Makefile.am                 |   10 +++++-----
>  src/locking/virtlockd.socket    |    8 ++++++++
>  src/locking/virtlockd.socket.in |    8 --------
>  3 files changed, 13 insertions(+), 13 deletions(-)
>  create mode 100644 src/locking/virtlockd.socket
>  delete mode 100644 src/locking/virtlockd.socket.in
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 955973e..d573c6d 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1675,21 +1675,21 @@ virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
>  
>  
>  
> -EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket.in
> +EXTRA_DIST += locking/virtlockd.service.in locking/virtlockd.socket
>  
>  if WITH_LIBVIRTD
>  if LIBVIRT_INIT_SCRIPT_SYSTEMD
>  
>  SYSTEMD_UNIT_DIR = /lib/systemd/system
>  
> -BUILT_SOURCES += virtlockd.service virtlockd.socket
> -DISTCLEANFILES += virtlockd.service virtlockd.socket
> +BUILT_SOURCES += virtlockd.service
> +DISTCLEANFILES += virtlockd.service
>  
> -install-systemd: virtlockd.service virtlockd.socket install-sysconfig
> +install-systemd: virtlockd.service install-sysconfig
>  	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
>  	$(INSTALL_DATA) virtlockd.service \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
> -	$(INSTALL_DATA) virtlockd.socket \
> +	$(INSTALL_DATA) locking/virtlockd.socket \
>  	  $(DESTDIR)$(SYSTEMD_UNIT_DIR)/
>  
>  uninstall-systemd: uninstall-sysconfig
> diff --git a/src/locking/virtlockd.socket b/src/locking/virtlockd.socket
> new file mode 100644
> index 0000000..0589a29
> --- /dev/null
> +++ b/src/locking/virtlockd.socket
> @@ -0,0 +1,8 @@
> +[Unit]
> +Description=Virtual machine lock manager socket
> +
> +[Socket]
> +ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
> +
> +[Install]
> +WantedBy=multi-user.target
> diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
> deleted file mode 100644
> index 0589a29..0000000
> --- a/src/locking/virtlockd.socket.in
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -[Unit]
> -Description=Virtual machine lock manager socket
> -
> -[Socket]
> -ListenStream=/var/run/libvirt/virtlockd/virtlockd.sock
> -
> -[Install]
> -WantedBy=multi-user.target
>