From 28b939d6c5eb14122fe20d6ecc826fe4d2393aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Mon, 28 Apr 2014 20:16:09 -0400 Subject: [PATCH] revert 1d16785 - fixes #191 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Serge Hallyn --- 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 21db8044fd..df1304ac2f 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); }