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>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index e78f685df6f42204b23c4c36c95d8cc87f0f68c2..2eb17d8a629b9ee08b9716fb436c227047624a12 100644 (file)
--- 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))
-               return -1;
+       handler->ops->start(handler, handler->data);
 
 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;