github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4662 from BenTheElder/fifo-dup2-unix

Browse Source 
Revender latest containerd/fifo
This commit is contained in:
Phil Estes 2020-10-26 19:32:23 -04:00 committed by GitHub
commit 65e39897bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -5,7 +5,7 @@ github.com/containerd/btrfs 153935315f4ab9be5bf03650a134
github.com/containerd/cgroups 0b889c03f102012f1d93a97ddd3ef71cd6f4f510
github.com/containerd/console v1.0.1
github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
github.com/containerd/fifo cc76b10a4c47cdfac4bf6c373cc643628a72bfe9
github.com/containerd/fifo 0724c46b320cf96bb172a0550c19a4b1fca4dacb
github.com/containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c
github.com/containerd/nri eb1350a75164f76de48e3605389e7a3fbc85d06e
github.com/containerd/ttrpc v1.0.2

3
vendor/github.com/containerd/fifo/fifo.go generated vendored
View File

@ -25,6 +25,7 @@ import (
"syscall"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
type fifo struct {
@ -48,7 +49,7 @@ func OpenFifoDup2(ctx context.Context, fn string, flag int, perm os.FileMode, fd
return nil, errors.Wrap(err, "fifo error")
}
if err := syscall.Dup2(int(f.file.Fd()), fd); err != nil {
if err := unix.Dup2(int(f.file.Fd()), fd); err != nil {
_ = f.Close()
return nil, errors.Wrap(err, "dup2 error")
}