From: RicardoSanchezA <ricardo.sanchez@utexas.edu>
Date: Wed, 6 Dec 2017 15:28:19 +0000 (-0600)
Subject: lxc_init: move up to src/lxc
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09d14a78d5a43c384aecd7fba6f591a9219bc7bb;p=thirdparty%2Flxc.git

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 522eec331..5ada46e43 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -275,7 +275,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
@@ -303,7 +303,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 c8a5e35b0..06e7d963f 100644
--- 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 "tools/arguments.h"
 #include "error.h"
 #include "initutils.h"