hooks: put binary hooks into $libexecdir/lxc/hooks

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 874b446383e071f5295cee874f546a8f578e22b4..c5e6d288f25093e3a41be246cd7a3441895dee32 100644 (file)
--- 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 499a2c4cf9f40420a54e20fe6b8c2ecddab4924d..23b85c8f31aaeccdc321716798bd07cd67704958 100644 (file)
--- 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 = \