From 83758ed00f731b11abed774097112db61b7131bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Wed, 30 Oct 2013 16:10:26 -0400 Subject: [PATCH] daemonize implies close_all_fds so set it in lxcapi_want_daemonize instead of setting in every cli or in every binding explicitly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported-by: Fatih Arslan Signed-off-by: S.Çağlar Onur Signed-off-by: Serge Hallyn --- src/lxc/lxc_start.c | 2 +- src/lxc/lxccontainer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c index 2e3c3b30b..add2542f2 100644 --- a/src/lxc/lxc_start.c +++ b/src/lxc/lxc_start.c @@ -96,7 +96,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg) switch (c) { case 'c': args->console = arg; break; case 'L': args->console_log = arg; break; - case 'd': args->daemonize = 1; args->close_all_fds = 1; break; + case 'd': args->daemonize = 1; break; case 'f': args->rcfile = arg; break; case 'C': args->close_all_fds = 1; break; case 's': return lxc_config_define_add(&defines, arg); diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 1254dc040..8b81a6346 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -459,6 +459,8 @@ static void lxcapi_want_daemonize(struct lxc_container *c) return; } c->daemonize = 1; + /* daemonize implies close_all_fds so set it */ + c->lxc_conf->close_all_fds = 1; container_mem_unlock(c); } -- 2.39.5