revert 1d167857 - 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>

revert 1d167857 - fixes #191
71a606ee · S.Çağlar Onur · Serge Hallyn · f79b86a3 · 71a606ee
Commit 71a606ee authored Apr 28, 2014 by S.Çağlar Onur Committed by Serge Hallyn Apr 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- 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);
 }