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

[Wolfgang Bumiller]

> On October 29, 2015 at 10:55 PM Stéphane Graber <stgraber at ubuntu.com> wrote:
> Hi,
> 
> As this is an executable binary, shouldn't it be under libexecdir instead?

Ah sorry, must have been some packaging trickery here that confused me (I blame
debian as it ended up in the same location here somehow)
(There hasn't been a 'libexec' dir on my systems for quite a while :-P)

Will resend in a bit.

> 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
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel