From 88329c69cd119535e5d3ec400f275aad35f8b6cc Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Fri, 13 Nov 2009 11:48:29 +0100 Subject: 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 Signed-off-by: Daniel Lezcano --- src/lxc/conf.c | 8 +++++--- 1 file 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) -- cgit v1.2.3-65-gdbad