aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/lxc/lxc_execute.c')
-rw-r--r--src/lxc/lxc_execute.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index f480859..1eb25a7 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -38,8 +38,9 @@
#include "confile.h"
#include "arguments.h"
#include "config.h"
+#include "start.h"
-lxc_log_define(lxc_execute_ui, lxc_start);
+lxc_log_define(lxc_execute_ui, lxc_execute);
static struct lxc_list defines;
@@ -87,7 +88,6 @@ Options :\n\
int main(int argc, char *argv[])
{
- static char **args;
char *rcfile;
struct lxc_conf *conf;
@@ -103,10 +103,6 @@ int main(int argc, char *argv[])
my_args.progname, my_args.quiet))
return -1;
- args = lxc_arguments_dup(LXCINITDIR "/lxc-init", &my_args);
- if (!args)
- return -1;
-
/* rcfile is specified in the cli option */
if (my_args.rcfile)
rcfile = (char *)my_args.rcfile;
@@ -140,6 +136,5 @@ int main(int argc, char *argv[])
if (lxc_config_define_load(&defines, conf))
return -1;
- return lxc_start(my_args.name, args, conf);
+ return lxc_execute(my_args.name, my_args.argv, my_args.quiet, conf);
}
-