Commit 71a606ee by S.Çağlar Onur Committed by Serge Hallyn

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 avatarS.Çağlar Onur <caglar@10ur.org> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent f79b86a3
...@@ -705,9 +705,6 @@ static int do_start(void *data) ...@@ -705,9 +705,6 @@ static int do_start(void *data)
if (lxc_console_set_stdfds(handler) < 0) if (lxc_console_set_stdfds(handler) < 0)
goto out_warn_father; goto out_warn_father;
if (lxc_check_inherited(handler->conf, handler->sigfd))
return -1;
/* If we mounted a temporary proc, then unmount it now */ /* If we mounted a temporary proc, then unmount it now */
tmp_proc_unmount(handler->conf); tmp_proc_unmount(handler->conf);
...@@ -1157,6 +1154,9 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf, ...@@ -1157,6 +1154,9 @@ int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf,
.argv = argv, .argv = argv,
}; };
if (lxc_check_inherited(conf, -1))
return -1;
conf->need_utmp_watch = 1; conf->need_utmp_watch = 1;
return __lxc_start(name, conf, &start_ops, &start_arg, lxcpath); return __lxc_start(name, conf, &start_ops, &start_arg, lxcpath);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment