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>

diff --git a/src/lxc/start.c b/src/lxc/start.c
index af9ec34b5b514869a4ec78a2cb9c310af013f938..1c620490ad486a1356909b7cb2afb6214341b11c 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -933,7 +933,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);