Unverified Commit f52624fa by Serge Hallyn Committed by GitHub

Merge pull request #2309 from brauner/2018-05-08/fix_execute

execute: do not check inherited fds again
parents 7101cb03 c7a2deb2
...@@ -139,9 +139,6 @@ int lxc_execute(const char *name, char *const argv[], int quiet, ...@@ -139,9 +139,6 @@ int lxc_execute(const char *name, char *const argv[], int quiet,
{ {
struct execute_args args = {.argv = argv, .quiet = quiet}; struct execute_args args = {.argv = argv, .quiet = quiet};
if (lxc_check_inherited(handler->conf, false, &handler->conf->maincmd_fd, 1))
return -1;
handler->conf->is_execute = 1; handler->conf->is_execute = 1;
return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath, return __lxc_start(name, handler, &execute_start_ops, &args, lxcpath,
backgrounded, error_num); backgrounded, error_num);
......
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