Skip to content

Commit

Permalink
revert 1d16785 - fixes #191
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
caglar10ur authored and stgraber committed Apr 30, 2014
1 parent 2d309ce commit 28b939d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/lxc/start.c
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}

0 comments on commit 28b939d

Please sign in to comment.