[CRIU] [PATCH] autofs: install -- Ship scripts/systemd-autofs-restart.sh

Pavel Emelyanov xemul at virtuozzo.com
Tue Apr 19 22:15:07 PDT 2016


On 04/15/2016 09:10 PM, Cyrill Gorcunov wrote:
> From: Cyrill Gorcunov <gorcunov at virtuozzo.com>
> 
> This will be installed into $(prefix)/libexec/criu/scripts.

On my Debian node I don't have /usr/local/libexec dir at all. Are
you sure this is a ... "standard" path for custom scripts?

> Signed-off-by: Cyrill Gorcunov <gorcunov at virtuozzo.com>
> ---
>  Makefile.install | 4 +++-
>  criu/Makefile    | 2 ++
>  2 files changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile.install b/Makefile.install
> index 6fcf25e25562..1c5ecb64176c 100644
> --- a/Makefile.install
> +++ b/Makefile.install
> @@ -8,6 +8,7 @@ SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
>  LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
>  LIBDIR		?= $(PREFIX)/lib
>  INCLUDEDIR	?= $(PREFIX)/include/criu
> +LIBEXECDIR	?= $(PREFIX)/libexec
>  
>  #
>  # For recent Debian/Ubuntu with multiarch support.
> @@ -23,12 +24,13 @@ else
>  endif
>  
>  export SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
> -export INCLUDEDIR LIBDIR DESTDIR PREFIX
> +export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
>  
>  install-tree:
>  	$(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
>  	$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
>  	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
> +	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)
>  .PHONY: install-tree
>  
>  install-man:
> diff --git a/criu/Makefile b/criu/Makefile
> index acd44ac12136..c6e7a142ce3b 100644
> --- a/criu/Makefile
> +++ b/criu/Makefile
> @@ -205,6 +205,8 @@ install: criu
>  	$(Q) install -m 755 criu $(DESTDIR)$(SBINDIR)
>  	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
>  	$(Q) install -m 644 $(UAPI_HEADERS) $(DESTDIR)$(INCLUDEDIR)
> +	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/criu/scripts
> +	$(Q) install -m 755 $(SRC_DIR)/scripts/systemd-autofs-restart.sh $(DESTDIR)$(LIBEXECDIR)/criu/scripts
>  .PHONY: install
>  
>  #
> 



More information about the CRIU mailing list