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

Fix kill signals and rootfs path for pid

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a6e5e1851197ccc262c61190d5904dd410293466
Component: engine
This commit is contained in:
Michael Crosby
2014-02-24 14:35:27 -08:00
parent 4c203f5a85
commit 57d4919fc6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/execdriver/namespaces/driver.go
View File

@ -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 {