vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

containerd build clean on Solaris (#203)

Browse source 
* containerd build clean on Solaris

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>

* Vendor golang.org/x/sys

Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
This commit is contained in:
Amit Krishnan 2016-05-19 10:12:50 -07:00 • committed by Michael Crosby
parent b5981e004f
commit 62e1370f91
207 changed files with 108211 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

8
containerd-shim/process.go
View file

@ -166,11 +166,9 @@ func (p *process) start() error {
cmd.Stdin = p.stdio.stdin
cmd.Stdout = p.stdio.stdout
cmd.Stderr = p.stdio.stderr
// set the parent death signal to SIGKILL so that if the shim dies the container
// process also dies
cmd.SysProcAttr = &syscall.SysProcAttr{
Pdeathsig: syscall.SIGKILL,
}
// Call out to setPDeathSig to set SysProcAttr as elements are platform specific
cmd.SysProcAttr = setPDeathSig()
if err := cmd.Start(); err != nil {
if exErr, ok := err.(*exec.Error); ok {
if exErr.Err == exec.ErrNotFound || exErr.Err == os.ErrNotExist {