Merge pull request #1984 from cyphar/memfd-cleanups

nsenter: cloned_binary: "memfd" cleanups
opencontainers · Mar 7, 2019 · 2b18fe1 · 2b18fe1
2 parents 923a8f8 + 2d4a37b
commit 2b18fe1
Show file tree

Hide file tree

Showing 2 changed files with 307 additions and 55 deletions.
diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go
@@ -482,6 +482,7 @@ func (c *linuxContainer) commandTemplate(p *Process, childPipe *os.File) (*exec.
 	cmd.ExtraFiles = append(cmd.ExtraFiles, childPipe)
 	cmd.Env = append(cmd.Env,
 		fmt.Sprintf("_LIBCONTAINER_INITPIPE=%d", stdioFdCount+len(cmd.ExtraFiles)-1),
+		fmt.Sprintf("_LIBCONTAINER_STATEDIR=%s", c.root),
 	)
 	// NOTE: when running a container with no PID namespace and the parent process spawning the container is
 	// PID1 the pdeathsig is being delivered to the container's init process by the kernel for some reason