[lxc-devel] [PATCH] [RFC] revert 1d16785 - fixes #191

S.Çağlar Onur caglar at 10ur.org
Tue Apr 29 00:16:09 UTC 2014


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 at 10ur.org>
---
 src/lxc/start.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 21db804..df1304a 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);
 }
-- 
1.9.1



More information about the lxc-devel mailing list