From: S.Çağlar Onur <caglar@10ur.org>
Date: Tue, 29 Apr 2014 00:16:09 +0000 (-0400)
Subject: revert 1d16785 - fixes #191
X-Git-Tag: lxc-1.1.0.alpha1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71a606eeb366a8157626108db3a3bedc14469dd6;p=thirdparty%2Flxc.git

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 21db8044f..df1304ac2 100644
--- 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);
 }