[lxc-devel] [RFC lxc] hooks: put binary hooks into $libdir/lxc/hooks

[Stéphane Graber]

Hi,

As this is an executable binary, shouldn't it be under libexecdir instead?

On Wed, Oct 28, 2015 at 03:47:17PM +0100, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
> ---
>  configure.ac      | 1 +
>  hooks/Makefile.am | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 874b446..29706cc 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -539,6 +539,7 @@ AS_AC_EXPAND(LXCROOTFSMOUNT, "$with_rootfs_path")
>  AS_AC_EXPAND(LXCTEMPLATEDIR, "$datadir/lxc/templates")
>  AS_AC_EXPAND(LXCTEMPLATECONFIG, "$datadir/lxc/config")
>  AS_AC_EXPAND(LXCHOOKDIR, "$datadir/lxc/hooks")
> +AS_AC_EXPAND(LXCLIBHOOKDIR, "$libdir/lxc/hooks")
>  AS_AC_EXPAND(LXCINITDIR, "$libexecdir")
>  AS_AC_EXPAND(LOGPATH, "$with_log_path")
>  AS_AC_EXPAND(RUNTIME_PATH, "$with_runtime_path")
> diff --git a/hooks/Makefile.am b/hooks/Makefile.am
> index 499a2c4..263f62c 100644
> --- a/hooks/Makefile.am
> +++ b/hooks/Makefile.am
> @@ -1,4 +1,5 @@
>  hooksdir=@LXCHOOKDIR@
> +libhooksdir=@LXCLIBHOOKDIR@
>  
>  hooks_SCRIPTS = \
>  	clonehostname \
> @@ -6,7 +7,7 @@ hooks_SCRIPTS = \
>  	ubuntu-cloud-prep \
>  	squid-deb-proxy-client
>  
> -hooks_PROGRAMS = \
> +libhooks_PROGRAMS = \
>  	unmount-namespace
>  
>  unmount_namespace_SOURCES = \
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20151029/bef90558/attachment.sig>