diff options
| author |   Michel Normand <michel.mno@free.fr> | 2009-11-13 11:48:29 +0100 |
|---|---|---|
| committer |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2009-11-13 11:48:29 +0100 |
| commit | 88329c69cd119535e5d3ec400f275aad35f8b6cc (patch) | |
| tree | d0fd991bac6db5e083e8c48b31ade7e366b526ac | |
| parent | lxc-debian to not use empty mount table (diff) | |
| download | lxc-88329c69cd119535e5d3ec400f275aad35f8b6cc.tar.gz lxc-88329c69cd119535e5d3ec400f275aad35f8b6cc.tar.bz2 lxc-88329c69cd119535e5d3ec400f275aad35f8b6cc.zip | |
stop config reading if cgroup setting failed
in today's code lxc-start to not stop if setup_cgroup is detecting an error
Signed-off-by: Michel Normand <michel_mno@laposte.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
| -rw-r--r-- | src/lxc/conf.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 4c74734..6930f76 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -457,6 +457,7 @@ static int setup_cgroup(const char *name, struct lxc_list *cgroups) { struct lxc_list *iterator; struct lxc_cgroup *cg; + int ret = -1; if (lxc_list_empty(cgroups)) return 0; @@ -466,14 +467,15 @@ static int setup_cgroup(const char *name, struct lxc_list *cgroups) cg = iterator->elem; if (lxc_cgroup_set(name, cg->subsystem, cg->value)) - break; + goto out; DEBUG("cgroup '%s' set to '%s'", cg->subsystem, cg->value); } + ret = 0; INFO("cgroup has been setup"); - - return 0; +out: + return ret; } static void parse_mntopt(char *opt, unsigned long *flags, char **data) |