From a2739df5e4da120daa7443f4de882a1a054b5316 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 12 Jan 2015 23:06:01 -0600 Subject: [PATCH] Revert "set close-all-fds by default" it has unfortunate reprecussions elsewhere, and the needed fix can be done another way This reverts commit 1f76453a74f555e30384591567d87b5b4dac7e21. --- src/lxc/lxccontainer.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 5bb6152c1..406cead15 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -457,14 +457,6 @@ static bool lxcapi_load_config(struct lxc_container *c, const char *alt_file) 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) { if (!c || !c->lxc_conf) @@ -473,7 +465,10 @@ static bool lxcapi_want_daemonize(struct lxc_container *c, bool state) ERROR("Error getting mem lock"); 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); return true; } @@ -4103,9 +4098,7 @@ struct lxc_container *lxc_container_new(const char *name, const char *configpath container_destroy(c); lxcapi_clear_config(c); } - if (!c->lxc_conf) - c->lxc_conf = lxc_conf_init(); - do_set_daemonize(c, true); + c->daemonize = true; c->pidfile = NULL; // assign the member functions -- 2.47.2