From ee102305fb35a23668136b102ed4d0dd5b3d9ce5 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <lk4d4@docker.com>
Date: Fri, 27 Mar 2015 10:50:32 -0700
Subject: [PATCH] Use syscall.Kill instead of p.cmd.Process.Kill
We need this to unmask syscall.ESRCH error, which handled in docker and
can be handled by other clients.
Closes #457
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
---
process_linux.go | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/process_linux.go b/process_linux.go
index 5aab5a7f..1c74b654 100644
--- a/process_linux.go
+++ b/process_linux.go
@@ -4,6 +4,7 @@ package libcontainer
import (
"encoding/json"
+ "errors"
"io"
"os"
"os/exec"
@@ -44,8 +45,12 @@ func (p *setnsProcess) startTime() (string, error) {
return system.GetProcessStartTime(p.pid())
}
-func (p *setnsProcess) signal(s os.Signal) error {
- return p.cmd.Process.Signal(s)
+func (p *setnsProcess) signal(sig os.Signal) error {
+ s, ok := sig.(syscall.Signal)
+ if !ok {
+ return errors.New("os: unsupported signal type")
+ }
+ return syscall.Kill(p.cmd.Process.Pid, s)
}
func (p *setnsProcess) start() (err error) {
@@ -235,6 +240,10 @@ func (p *initProcess) createNetworkInterfaces() error {
return nil
}
-func (p *initProcess) signal(s os.Signal) error {
- return p.cmd.Process.Signal(s)
+func (p *initProcess) signal(sig os.Signal) error {
+ s, ok := sig.(syscall.Signal)
+ if !ok {
+ return errors.New("os: unsupported signal type")
+ }
+ return syscall.Kill(p.cmd.Process.Pid, s)
}