proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 13:31:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Install lxc-init in libexec dir

Browse Source 
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@quaqua.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Guido Trotter 2009-03-18 17:27:27 +00:00 committed by Daniel Lezcano
parent d0dfcfbde7
commit a25ba7aadb
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -16,6 +16,7 @@ AC_CHECK_PROG(SETCAP, setcap, yes, no)
AC_CHECK_PROG(DOCBOOK, docbook2man, yes, no) AC_CHECK_PROG(DOCBOOK, docbook2man, yes, no)
AM_CONDITIONAL(ENABLE_DOCBOOK, test x$DOCBOOK = xyes) AM_CONDITIONAL(ENABLE_DOCBOOK, test x$DOCBOOK = xyes)
AS_AC_EXPAND(BINDIR, $bindir) AS_AC_EXPAND(BINDIR, $bindir)
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir) AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)

8
src/lxc/Makefile.am
View File

@ -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 AM_LDFLAGS= -lutil
lib_LTLIBRARIES = liblxc.la lib_LTLIBRARIES = liblxc.la
pkginclude_HEADERS = \ pkginclude_HEADERS = \
@ -56,7 +58,6 @@ bin_SCRIPTS = \
bin_PROGRAMS = \ bin_PROGRAMS = \
lxc-unshare \ lxc-unshare \
lxc-init \
lxc-create \ lxc-create \
lxc-destroy \ lxc-destroy \
lxc-stop \ lxc-stop \
@ -73,6 +74,9 @@ bin_PROGRAMS = \
lxc-restart \ lxc-restart \
lxc-version lxc-version
libexec_PROGRAMS = \
lxc-init
lxc_unshare_SOURCES = lxc_unshare.c lxc_unshare_SOURCES = lxc_unshare.c
lxc_unshare_LDADD = liblxc.la lxc_unshare_LDADD = liblxc.la

2
src/lxc/lxc_execute.c
View File

@ -97,7 +97,7 @@ int main(int argc, char *argv[])
} }
nbargs = 0; nbargs = 0;
args[nbargs++] = LXCBINDIR "/lxc-init"; args[nbargs++] = LXCLIBEXECDIR "/lxc-init";
args[nbargs++] = "--mount-procfs"; args[nbargs++] = "--mount-procfs";
args[nbargs++] = "--"; args[nbargs++] = "--";