clean up syncs

Always unblock parent when child setup fails, rather than just exiting. Also remove a duplicate call to setup_cgroup(). We'll want it close to there for userns, but not right there - that's too late, and could happen after container init has done something bad without cgroup restrictions. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

clean up syncs
c4ea60df · Serge Hallyn · Stéphane Graber · 8538f388 · c4ea60df
Commit c4ea60df authored Jan 14, 2013 by Serge Hallyn Committed by Stéphane Graber Jan 15, 2013
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 9 deletions

start.c src/lxc/start.c +3 -9

No files found.
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -585,7 +585,7 @@ static int do_start(void *data)
 	if (handler->conf->need_utmp_watch) {
 		if (prctl(PR_CAPBSET_DROP, CAP_SYS_BOOT, 0, 0, 0)) {
 			SYSERROR("failed to remove CAP_SYS_BOOT capability");
-			return -1;
+			goto out_warn_father;
 		}
 		DEBUG("Dropped cap_sys_boot\n");
 	}
@@ -620,15 +620,14 @@ static int do_start(void *data)
 	if (putenv("container=lxc")) {
 		SYSERROR("failed to set environment variable");
-		return -1;
+		goto out_warn_father;
 	}
 	close(handler->sigfd);
 	/* after this call, we are in error because this
 	 * ops should not return as it execs */
-	if (handler->ops->start(handler, handler->data))
+	handler->ops->start(handler, handler->data);
-		return -1;
 out_warn_father:
 	lxc_sync_wake_parent(handler, LXC_SYNC_POST_CONFIGURE);
@@ -751,11 +750,6 @@ int lxc_spawn(struct lxc_handler *handler)
 	if (detect_shared_rootfs())
 		umount2(handler->conf->rootfs.mount, MNT_DETACH);
-	if (setup_cgroup(name, &handler->conf->cgroup)) {
-		ERROR("failed to setup the cgroups for '%s'", name);
-		goto out_delete_net;
-	}
 	if (handler->ops->post_start(handler, handler->data))
 		goto out_abort;