Commit 83758ed0 by S.Çağlar Onur Committed by Serge Hallyn

daemonize implies close_all_fds so set it in lxcapi_want_daemonize instead of…

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: 's avatarFatih Arslan <ftharsln@gmail.com> Signed-off-by: 's avatarS.Çağlar Onur <caglar@10ur.org> Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com>
parent 0590e82c
...@@ -96,7 +96,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg) ...@@ -96,7 +96,7 @@ static int my_parser(struct lxc_arguments* args, int c, char* arg)
switch (c) { switch (c) {
case 'c': args->console = arg; break; case 'c': args->console = arg; break;
case 'L': args->console_log = 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 'f': args->rcfile = arg; break;
case 'C': args->close_all_fds = 1; break; case 'C': args->close_all_fds = 1; break;
case 's': return lxc_config_define_add(&defines, arg); case 's': return lxc_config_define_add(&defines, arg);
......
...@@ -459,6 +459,8 @@ static void lxcapi_want_daemonize(struct lxc_container *c) ...@@ -459,6 +459,8 @@ static void lxcapi_want_daemonize(struct lxc_container *c)
return; return;
} }
c->daemonize = 1; c->daemonize = 1;
/* daemonize implies close_all_fds so set it */
c->lxc_conf->close_all_fds = 1;
container_mem_unlock(c); container_mem_unlock(c);
} }
......
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