preserve inherited fds for stop hook

When preserving fds for the stop hook, make sure to also save
any fds we've inherited.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2016-01-11 20:55:30 -08:00
parent ffe344373e
commit 330cbe36d8

View File

@ -1068,7 +1068,7 @@ static int lxc_spawn(struct lxc_handler *handler)
goto out_delete_net;
}
if (!preserve_ns(handler->nsfd, handler->clone_flags, handler->pid, &errmsg)) {
if (!preserve_ns(handler->nsfd, handler->clone_flags | preserve_mask, handler->pid, &errmsg)) {
INFO("Failed to store namespace references for stop hook: %s",
errmsg ? errmsg : "(Out of memory)");
free(errmsg);