Unverified Commit 136a4dc2 by Christian Brauner Committed by Stéphane Graber

confile: add getter for lxc.init_cmd

parent 9a26f732
......@@ -183,6 +183,8 @@ static int set_config_environment(const char *, const char *, struct lxc_conf *)
static int get_config_environment(struct lxc_container *, const char *, char *, int);
static int set_config_init_cmd(const char *, const char *, struct lxc_conf *);
static int get_config_init_cmd(struct lxc_container *, const char *, char *, int);
static int set_config_init_uid(const char *, const char *, struct lxc_conf *);
static int set_config_init_gid(const char *, const char *, struct lxc_conf *);
static int set_config_ephemeral(const char *, const char *, struct lxc_conf *);
......@@ -252,7 +254,7 @@ static struct lxc_config_t config[] = {
{ "lxc.monitor.unshare", set_config_monitor, get_config_monitor, NULL},
{ "lxc.group", set_config_group, get_config_group, NULL},
{ "lxc.environment", set_config_environment, get_config_environment, NULL},
{ "lxc.init_cmd", set_config_init_cmd, NULL, NULL},
{ "lxc.init_cmd", set_config_init_cmd, get_config_init_cmd, NULL},
{ "lxc.init_uid", set_config_init_uid, NULL, NULL},
{ "lxc.init_gid", set_config_init_gid, NULL, NULL},
{ "lxc.ephemeral", set_config_ephemeral, NULL, NULL},
......@@ -2477,9 +2479,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
{
const char *v = NULL;
if (strcmp(key, "lxc.init_cmd") == 0)
v = c->init_cmd;
else if (strcmp(key, "lxc.init_uid") == 0)
if (strcmp(key, "lxc.init_uid") == 0)
return lxc_get_conf_int(c, retv, inlen, c->init_uid);
else if (strcmp(key, "lxc.init_gid") == 0)
return lxc_get_conf_int(c, retv, inlen, c->init_gid);
......@@ -3656,3 +3656,9 @@ static int get_config_environment(struct lxc_container *c, const char *key,
}
return fulllen;
}
static int get_config_init_cmd(struct lxc_container *c, const char *key,
char *retv, int inlen)
{
return lxc_get_conf_str(retv, inlen, c->lxc_conf->init_cmd);
}
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