Skip to content

L
lxc
Commit a2739df5 by Serge Hallyn
Options

Revert "set close-all-fds by default"

it has unfortunate reprecussions elsewhere, and the needed fix can be done another way This reverts commit 1f76453a.
parent d2f31a57
Showing with 5 additions and 12 deletions
src/lxc/lxccontainer.c
...@@ -457,14 +457,6 @@ static bool lxcapi_load_config(struct lxc_container *c, const char *alt_file) ...@@ -457,14 +457,6 @@ static bool lxcapi_load_config(struct lxc_container *c, const char *alt_file)
return ret; return ret;
} }
static void do_set_daemonize(struct lxc_container *c, bool state)
{
c->daemonize = state;
/* daemonize implies close_all_fds so set it */
if (state)
c->lxc_conf->close_all_fds = 1;
}
static bool lxcapi_want_daemonize(struct lxc_container *c, bool state) static bool lxcapi_want_daemonize(struct lxc_container *c, bool state)
{ {
if (!c || !c->lxc_conf) if (!c || !c->lxc_conf)
...@@ -473,7 +465,10 @@ static bool lxcapi_want_daemonize(struct lxc_container *c, bool state) ...@@ -473,7 +465,10 @@ static bool lxcapi_want_daemonize(struct lxc_container *c, bool state)
ERROR("Error getting mem lock"); ERROR("Error getting mem lock");
return false; return false;
} }
do_set_daemonize(c, state); c->daemonize = state;
/* daemonize implies close_all_fds so set it */
if (state == 1)
c->lxc_conf->close_all_fds = 1;
container_mem_unlock(c); container_mem_unlock(c);
return true; return true;
} }
...@@ -4103,9 +4098,7 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath ...@@ -4103,9 +4098,7 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath
container_destroy(c); container_destroy(c);
lxcapi_clear_config(c); lxcapi_clear_config(c);
} }
if (!c->lxc_conf) c->daemonize = true;
c->lxc_conf = lxc_conf_init();
do_set_daemonize(c, true);
c->pidfile = NULL; c->pidfile = NULL;
// assign the member functions // assign the member functions
......
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