Default command is "/sbin/init" for lxc-start

From: Daniel Lezcano <dlezcano@fr.ibm.com>

When no command is specified is specified for lxc-start, the "/sbin/init"
is automatically used.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index b626da51ff22f61ebc8a02ad56ad39edfade2402..1af2b0245b2d7aa58b1007b60ddb62af913d23c3 100644 (file)
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -47,6 +47,10 @@ int main(int argc, char *argv[])
        char *name = NULL;
        char **args;
        int nbargs = 0;
+       char *default_args[] = {
+               "/sbin/init",
+               '\0',
+       };
 
        while ((opt = getopt(argc, argv, "n:")) != -1) {
                switch (opt) {
@@ -58,11 +62,15 @@ int main(int argc, char *argv[])
                nbargs++;
        }
 
-       if (!name || !argv[optind] || !strlen(argv[optind]))
-               usage(argv[0]);
+       if (!argv[optind] || !strlen(argv[optind]))
+               args = default_args; 
+       else {
+               args = &argv[optind];
+               argc -= nbargs;
+       }
 
-       args = &argv[optind];
-       argc -= nbargs;
+       if (!name)
+               usage(argv[0]);
 
        if (lxc_start(name, args)) {
                fprintf(stderr, "failed to start %s\n", name);