From: S.Çağlar Onur Date: Wed, 30 Oct 2013 20:10:26 +0000 (-0400) Subject: daemonize implies close_all_fds so set it in lxcapi_want_daemonize instead of setting... X-Git-Tag: lxc-1.0.0.alpha3~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83758ed00f731b11abed774097112db61b7131bf;p=thirdparty%2Flxc.git daemonize implies close_all_fds so set it in lxcapi_want_daemonize instead of setting in every cli or in every binding explicitly Reported-by: Fatih Arslan Signed-off-by: S.Çağlar Onur Signed-off-by: Serge Hallyn --- 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); }