lxc_init: move up to src/lxc

lxc_init.c is actually not a tool, thus it doesn't belong to the tools/ subfolder

Signed-off-by: RicardoSanchezA <ricardo.sanchez@utexas.edu>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index c22f90f995e327f2c71a84a6c176a728fdb5594e..7df56f54f2bdb32899bccd29b8a62d1a270a8c44 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -261,7 +261,7 @@ lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c
 lxc_execute_SOURCES = tools/lxc_execute.c tools/arguments.c
 lxc_freeze_SOURCES = tools/lxc_freeze.c tools/arguments.c
 lxc_info_SOURCES = tools/lxc_info.c tools/arguments.c
-init_lxc_SOURCES = tools/lxc_init.c tools/arguments.c
+init_lxc_SOURCES = lxc_init.c tools/arguments.c
 lxc_monitor_SOURCES = tools/lxc_monitor.c tools/arguments.c
 lxc_ls_SOURCES = tools/lxc_ls.c tools/arguments.c
 lxc_copy_SOURCES = tools/lxc_copy.c tools/arguments.c
@@ -289,7 +289,7 @@ endif
 if HAVE_STATIC_LIBCAP
 sbin_PROGRAMS += init.lxc.static
 
-init_lxc_static_SOURCES = tools/lxc_init.c error.c log.c initutils.c caps.c \
+init_lxc_static_SOURCES = lxc_init.c error.c log.c initutils.c caps.c \
                          tools/arguments.c
 
 if !HAVE_GETLINE

diff --git a/src/lxc/tools/lxc_init.c b/src/lxc/lxc_init.c
similarity index 99%
rename from src/lxc/tools/lxc_init.c
rename to src/lxc/lxc_init.c
index 823dc18508a5ecb6eac8a571f788b178010897bf..55d43f809628f5a6b12b134f42496fccdc3e4de6 100644 (file)
--- a/src/lxc/tools/lxc_init.c
+++ b/src/lxc/lxc_init.c
@@ -36,6 +36,7 @@
 #include <lxc/lxccontainer.h>
 
 #include "log.h"
+#include "arguments.h"
 #include "error.h"
 #include "initutils.h"