confile: add getter for lxc.group

parent ac0f949c
...@@ -189,6 +189,8 @@ static int set_config_monitor(const char *, const char *, struct lxc_conf *); ...@@ -189,6 +189,8 @@ static int set_config_monitor(const char *, const char *, struct lxc_conf *);
static int get_config_monitor(struct lxc_container *, const char *, char *, int); static int get_config_monitor(struct lxc_container *, const char *, char *, int);
static int set_config_group(const char *, const char *, struct lxc_conf *); static int set_config_group(const char *, const char *, struct lxc_conf *);
static int get_config_group(struct lxc_container *, const char *, char *, int);
static int set_config_environment(const char *, const char *, struct lxc_conf *); static int set_config_environment(const char *, const char *, struct lxc_conf *);
static int set_config_init_cmd(const char *, const char *, struct lxc_conf *); static int set_config_init_cmd(const char *, const char *, struct lxc_conf *);
static int set_config_init_uid(const char *, const char *, struct lxc_conf *); static int set_config_init_uid(const char *, const char *, struct lxc_conf *);
...@@ -260,7 +262,7 @@ static struct lxc_config_t config[] = { ...@@ -260,7 +262,7 @@ static struct lxc_config_t config[] = {
{ "lxc.start.delay", set_config_start, get_config_start, NULL}, { "lxc.start.delay", set_config_start, get_config_start, NULL},
{ "lxc.start.order", set_config_start, get_config_start, NULL}, { "lxc.start.order", set_config_start, get_config_start, NULL},
{ "lxc.monitor.unshare", set_config_monitor, get_config_monitor, NULL}, { "lxc.monitor.unshare", set_config_monitor, get_config_monitor, NULL},
{ "lxc.group", set_config_group, NULL, NULL}, { "lxc.group", set_config_group, get_config_group, NULL},
{ "lxc.environment", set_config_environment, NULL, NULL}, { "lxc.environment", set_config_environment, NULL, NULL},
{ "lxc.init_cmd", set_config_init_cmd, NULL, NULL}, { "lxc.init_cmd", set_config_init_cmd, NULL, NULL},
{ "lxc.init_uid", set_config_init_uid, NULL, NULL}, { "lxc.init_uid", set_config_init_uid, NULL, NULL},
...@@ -2707,22 +2709,6 @@ static int lxc_get_limit_entry(struct lxc_conf *c, char *retv, int inlen, ...@@ -2707,22 +2709,6 @@ static int lxc_get_limit_entry(struct lxc_conf *c, char *retv, int inlen,
return fulllen; return fulllen;
} }
static int lxc_get_item_groups(struct lxc_conf *c, char *retv, int inlen)
{
int len, fulllen = 0;
struct lxc_list *it;
if (!retv)
inlen = 0;
else
memset(retv, 0, inlen);
lxc_list_for_each(it, &c->groups) {
strprint(retv, inlen, "%s\n", (char *)it->elem);
}
return fulllen;
}
static int lxc_get_item_environment(struct lxc_conf *c, char *retv, int inlen) static int lxc_get_item_environment(struct lxc_conf *c, char *retv, int inlen)
{ {
int len, fulllen = 0; int len, fulllen = 0;
...@@ -2744,9 +2730,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv, ...@@ -2744,9 +2730,7 @@ int lxc_get_config_item(struct lxc_conf *c, const char *key, char *retv,
{ {
const char *v = NULL; const char *v = NULL;
if (strcmp(key, "lxc.group") == 0) if (strcmp(key, "lxc.environment") == 0)
return lxc_get_item_groups(c, retv, inlen);
else if (strcmp(key, "lxc.environment") == 0)
return lxc_get_item_environment(c, retv, inlen); return lxc_get_item_environment(c, retv, inlen);
else if (strcmp(key, "lxc.init_cmd") == 0) else if (strcmp(key, "lxc.init_cmd") == 0)
v = c->init_cmd; v = c->init_cmd;
...@@ -3972,3 +3956,20 @@ static int get_config_monitor(struct lxc_container *c, const char *key, ...@@ -3972,3 +3956,20 @@ static int get_config_monitor(struct lxc_container *c, const char *key,
return lxc_get_conf_int(c->lxc_conf, retv, inlen, return lxc_get_conf_int(c->lxc_conf, retv, inlen,
c->lxc_conf->monitor_unshare); c->lxc_conf->monitor_unshare);
} }
static int get_config_group(struct lxc_container *c, const char *key,
char *retv, int inlen)
{
int len, fulllen = 0;
struct lxc_list *it;
if (!retv)
inlen = 0;
else
memset(retv, 0, inlen);
lxc_list_for_each(it, &c->lxc_conf->groups) {
strprint(retv, inlen, "%s\n", (char *)it->elem);
}
return fulllen;
}
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