From 52ce1be484b8432d2c6f902505bfbb9911da26e0 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 6 Mar 2014 14:14:25 -0800 Subject: [PATCH] Remove the ghosts and kill everything Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- nsinit/init.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nsinit/init.go b/nsinit/init.go index 45ab8815..1f8ad364 100644 --- a/nsinit/init.go +++ b/nsinit/init.go @@ -48,17 +48,14 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol return fmt.Errorf("setctty %s", err) } } - - /* this is commented out so that we get the current Ghost functionality - 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) } - if err := setupNetwork(container, context); err != nil { return fmt.Errorf("setup networking %s", err) }