Remove the ghosts and kill everything

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-06 14:14:25 -08:00
parent 520773503a
commit 52ce1be484
1 changed files with 4 additions and 7 deletions

View File

@ -48,17 +48,14 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
return fmt.Errorf("setctty %s", err) return fmt.Errorf("setctty %s", err)
} }
} }
/*
/* this is commented out so that we get the current Ghost functionality if err := system.ParentDeathSignal(); err != nil {
if err := system.ParentDeathSignal(); err != nil { return fmt.Errorf("parent death signal %s", err)
return fmt.Errorf("parent death signal %s", err) }
}
*/ */
if err := setupNewMountNamespace(rootfs, console, container.ReadonlyFs); err != nil { if err := setupNewMountNamespace(rootfs, console, container.ReadonlyFs); err != nil {
return fmt.Errorf("setup mount namespace %s", err) return fmt.Errorf("setup mount namespace %s", err)
} }
if err := setupNetwork(container, context); err != nil { if err := setupNetwork(container, context); err != nil {
return fmt.Errorf("setup networking %s", err) return fmt.Errorf("setup networking %s", err)
} }