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

5
runtime/process.go
View file

@ -12,6 +12,7 @@ import (
"syscall"
"github.com/docker/containerd/specs"
"golang.org/x/sys/unix"
)
type Process interface {
@ -231,7 +232,7 @@ func (p *process) Wait() {
}
func getExitPipe(path string) (*os.File, error) {
if err := syscall.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
if err := unix.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
return nil, err
}
// add NONBLOCK in case the other side has already closed or else
@ -240,7 +241,7 @@ func getExitPipe(path string) (*os.File, error) {
}
func getControlPipe(path string) (*os.File, error) {
if err := syscall.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
if err := unix.Mkfifo(path, 0755); err != nil && !os.IsExist(err) {
return nil, err
}
return os.OpenFile(path, syscall.O_RDWR|syscall.O_NONBLOCK, 0)