toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4511 from crosbymichael/ensure-native-containers-die

Browse Source 
Ensure that native containers die with the parent
Upstream-commit: f244d9763e175ab59e3827a5e873f92d907776a8
Component: engine
This commit is contained in:
unclejack
2014-03-07 02:49:10 +02:00
parent fe7e822dde c896586b70
commit 1eac63153d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/pkg/libcontainer/nsinit/init.go
+3 -5
View File
@@ -48,11 +48,9 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
return fmt.Errorf("setctty %s", err)
}
}
/*
if err := system.ParentDeathSignal(); err != nil {
return fmt.Errorf("parent death signal %s", err)
}
*/
if err := system.ParentDeathSignal(); err != nil {
return fmt.Errorf("parent death signal %s", err)
}
if err := setupNewMountNamespace(rootfs, console, container.ReadonlyFs); err != nil {
return fmt.Errorf("setup mount namespace %s", err)
}