From 57d4919fc6852eac1be8ae7cf55727e5367e6f83 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 24 Feb 2014 14:35:27 -0800 Subject: [PATCH] Fix kill signals and rootfs path for pid Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) Upstream-commit: a6e5e1851197ccc262c61190d5904dd410293466 Component: engine --- components/engine/execdriver/namespaces/driver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/execdriver/namespaces/driver.go b/components/engine/execdriver/namespaces/driver.go index 7dbea4c5c8..6cb2e5b522 100644 --- a/components/engine/execdriver/namespaces/driver.go +++ b/components/engine/execdriver/namespaces/driver.go @@ -64,7 +64,7 @@ type info struct { } func (i *info) IsRunning() bool { - p := filepath.Join(i.driver.root, "containers", i.ID, "rootfs", ".nspid") + p := filepath.Join(i.driver.root, "containers", i.ID, "root", ".nspid") if _, err := os.Stat(p); err == nil { return true } @@ -106,7 +106,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba } func (d *driver) Kill(p *execdriver.Command, sig int) error { - return p.Process.Kill() + return syscall.Kill(p.Process.Pid, syscall.Signal(sig)) } func (d *driver) Restore(c *execdriver.Command) error {