Merge pull request #761 from hallyn/2016-01-11/preservens.1

preserve inherited fds for stop hook
lxc · Jan 12, 2016 · 52ba9c5 · 52ba9c5
2 parents ffe3443 + 330cbe3
commit 52ba9c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);