Skip to content

L
lxc
Commit b2b6c597 by dlezcano
Options

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: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 0780e343
Showing with 12 additions and 4 deletions
src/lxc/lxc_start.c
...@@ -47,6 +47,10 @@ int main(int argc, char *argv[]) ...@@ -47,6 +47,10 @@ int main(int argc, char *argv[])
char *name = NULL; char *name = NULL;
char **args; char **args;
int nbargs = 0; int nbargs = 0;
char *default_args[] = {
"/sbin/init",
'\0',
};
while ((opt = getopt(argc, argv, "n:")) != -1) { while ((opt = getopt(argc, argv, "n:")) != -1) {
switch (opt) { switch (opt) {
...@@ -58,11 +62,15 @@ int main(int argc, char *argv[]) ...@@ -58,11 +62,15 @@ int main(int argc, char *argv[])
nbargs++; nbargs++;
} }
if (!name || !argv[optind] || !strlen(argv[optind])) if (!argv[optind] || !strlen(argv[optind]))
usage(argv[0]); args = default_args;
else {
args = &argv[optind];
argc -= nbargs;
}
args = &argv[optind]; if (!name)
argc -= nbargs; usage(argv[0]);
if (lxc_start(name, args)) { if (lxc_start(name, args)) {
fprintf(stderr, "failed to start %s\n", name); fprintf(stderr, "failed to start %s\n", name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment