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 0d91eb39409f1ec2349875b8ecf85b004649ac5f..06bfd4b0914da7f0a5ef68f07bbb553146ae961c 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -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);