revert 1d16785 - fixes #191

According to Serge, we no longer need to keep cgmanager connection open.

As long as my tests go it seems to be working fine.

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 21db8044fdb9d1275d7cfef8a1b4939806b991a4..df1304ac2f0527c6edb2453c9e07d28af5409b3a 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -705,9 +705,6 @@ static int do_start(void *data)
        if (lxc_console_set_stdfds(handler) < 0)
                goto out_warn_father;
 
-       if (lxc_check_inherited(handler->conf, handler->sigfd))
-               return -1;
-
        /* If we mounted a temporary proc, then unmount it now */
        tmp_proc_unmount(handler->conf);
 
@@ -1157,6 +1154,9 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf,
                .argv = argv,
        };
 
+       if (lxc_check_inherited(conf, -1))
+               return -1;
+
        conf->need_utmp_watch = 1;
        return __lxc_start(name, conf, &start_ops, &start_arg, lxcpath);
 }