[lxc-devel] [PATCH] Install lxc-init in libexec dir
Guido Trotter
ultrotter at google.com
Wed Mar 18 15:35:33 UTC 2009
Since lxc-init is a helper program, which doesn't have an usage output
and is only going to be called only internally by lxc-execute, we'll
move it to the libexec dir.
Signed-off-by: Guido Trotter <ultrotter at quaqua.net>
---
src/lxc/Makefile.am | 8 ++++++--
src/lxc/lxc_execute.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 9254bff..3f0c1d7 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" -DLXCBINDIR="\"$(bindir)\""
+INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" \
+ -DLXCBINDIR="\"$(bindir)\"" \
+ -DLXCLIBEXECDIR="\"$(libexecdir)\""
AM_LDFLAGS= -lutil
lib_LTLIBRARIES = liblxc.la
pkginclude_HEADERS = \
@@ -56,7 +58,6 @@ bin_SCRIPTS = \
bin_PROGRAMS = \
lxc-unshare \
- lxc-init \
lxc-create \
lxc-destroy \
lxc-stop \
@@ -73,6 +74,9 @@ bin_PROGRAMS = \
lxc-restart \
lxc-version
+libexec_PROGRAMS = \
+ lxc-init
+
lxc_unshare_SOURCES = lxc_unshare.c
lxc_unshare_LDADD = liblxc.la
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 362c03e..66f66fd 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
}
nbargs = 0;
- args[nbargs++] = LXCBINDIR "/lxc-init";
+ args[nbargs++] = LXCLIBEXECDIR "/lxc-init";
args[nbargs++] = "--mount-procfs";
args[nbargs++] = "--";
--
1.5.6.5
More information about the lxc-devel
mailing list