vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Move container.json and pid file into a root specific driver dir

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-25 12:41:31 -08:00
parent faa2334eea
commit 2acaf7ca82
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libcontainer/nsinit/execin.go
View file

@ -42,7 +42,7 @@ func (ns *linuxNs) ExecIn(container *libcontainer.Container, nspid int, args []s
// if the container has a new pid and mount namespace we need to
// remount proc and sys to pick up the changes
if container.Namespaces.Contains("CLONE_NEWNS") && container.Namespaces.Contains("CLONE_NEWPID") {
if container.Namespaces.Contains("NEWNS") && container.Namespaces.Contains("NEWPID") {
pid, err := system.Fork()
if err != nil {
return -1, err