mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-30 13:42:19 +00:00
Code Issues Releases Wiki Activity

support arguments in lxc.init_cmd

Browse Source 
Otherwise something like
	lxc.init_cmd = /sbin/init debug verbose
fails trying to execute a file called "/sbin/init debug verbose"

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
Serge Hallyn 2015-11-05 22:18:52 +00:00 committed by Stéphane Graber
parent 4ff8fb6cae
commit fd51a89b60
1 changed files with 69 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/lxc/lxccontainer.c
View File

@ -618,10 +618,64 @@ static bool am_single_threaded(void)
return count == 1; return count == 1;
} }
/* static void push_arg(char ***argp, char *arg, int *nargs)
* I can't decide if it'd be more convenient for callers if we accept '...', {
* or a null-terminated array (i.e. execl vs execv) char **argv;
*/ char *copy;
do {
copy = strdup(arg);
} while (!copy);
do {
argv = realloc(*argp, (*nargs + 2) * sizeof(char *));
} while (!argv);
*argp = argv;
argv[*nargs] = copy;
(*nargs)++;
argv[*nargs] = NULL;
}
static char **split_init_cmd(const char *incmd)
{
size_t len;
int nargs = 0;
char *copy, *p, *saveptr;
char **argv;
if (!incmd)
return NULL;
len = strlen(incmd) + 1;
copy = alloca(len);
strncpy(copy, incmd, len);
copy[len-1] = '\0';
do {
argv = malloc(sizeof(char *));
} while (!argv);
argv[0] = NULL;
for (p = strtok_r(copy, " ", &saveptr); p != NULL;
p = strtok_r(NULL, " ", &saveptr))
push_arg(&argv, p, &nargs);
if (nargs == 0) {
free(argv);
return NULL;
}
return argv;
}
static void free_init_cmd(char **argv)
{
int i = 0;
if (!argv)
return;
while (argv[i])
free(argv[i++]);
free(argv);
}
static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const argv[]) static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const argv[])
{ {
int ret; int ret;
@ -632,7 +686,7 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
"/sbin/init", "/sbin/init",
NULL, NULL,
}; };
char *init_cmd[2]; char **init_cmd = NULL;
/* container exists */ /* container exists */
if (!c) if (!c)
@ -673,15 +727,14 @@ static bool do_lxcapi_start(struct lxc_container *c, int useinit, char * const a
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
if (!argv) { /* if no argv was passed in, use lxc.init_cmd if provided in
if (conf->init_cmd) { * configuration */
init_cmd[0] = conf->init_cmd; if (!argv)
init_cmd[1] = NULL; argv = init_cmd = split_init_cmd(conf->init_cmd);
argv = init_cmd;
} /* ... and otherwise use default_args */
else if (!argv)
argv = default_args; argv = default_args;
}
/* /*
* say, I'm not sure - what locks do we want here? Any? * say, I'm not sure - what locks do we want here? Any?
@ -790,6 +843,8 @@ out:
c->pidfile = NULL; c->pidfile = NULL;
} }
free_init_cmd(init_cmd);
if (daemonize) if (daemonize)
exit (ret == 0 ? true : false); exit (ret == 0 ? true : false);
else else