[lxc-devel] [PATCH v2 lxc] hooks: put binary hooks into $libexecdir/lxc/hooks
Stéphane Graber
stgraber at ubuntu.com
Fri Nov 6 18:20:41 UTC 2015
On Thu, Nov 05, 2015 at 03:02:11PM +0100, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>
> ---
> Changes:
> 1) Use libexecdir instead of libdir.
> 2) Variables renamed:
> 2a) LXCLIBHOOKDIR => LXCBINHOOKDIR (s/LIB/BIN/)
> 2b) libhooksdir => binhooksdir
> 2c) libhooks_PROGRAMS => binhooks_PROGRAMS
>
> configure.ac | 1 +
> hooks/Makefile.am | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 874b446..c5e6d28 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(LXCBINHOOKDIR, "$libexecdir/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..23b85c8 100644
> --- a/hooks/Makefile.am
> +++ b/hooks/Makefile.am
> @@ -1,4 +1,5 @@
> hooksdir=@LXCHOOKDIR@
> +binhooksdir=@LXCBINHOOKDIR@
>
> hooks_SCRIPTS = \
> clonehostname \
> @@ -6,7 +7,7 @@ hooks_SCRIPTS = \
> ubuntu-cloud-prep \
> squid-deb-proxy-client
>
> -hooks_PROGRAMS = \
> +binhooks_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/20151106/dce7d16f/attachment-0001.sig>
More information about the lxc-devel
mailing list