opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5589 from giuseppe/rootlessport-use-unix

Browse Source 
rootlessport: use x/sys/unix instead of syscall
This commit is contained in:
OpenShift Merge Robot
2020-03-24 18:19:36 +01:00
committed by GitHub
parent d6f8c3e07d 720f0bc562
commit c29a4c6904
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/rootlessport/rootlessport_linux.go
View File

@ -20,7 +20,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
"syscall"
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/containers/storage/pkg/reexec" "github.com/containers/storage/pkg/reexec"
@ -30,6 +29,7 @@ import (
rkbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin" rkbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin"
rkportutil "github.com/rootless-containers/rootlesskit/pkg/port/portutil" rkportutil "github.com/rootless-containers/rootlesskit/pkg/port/portutil"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
) )
const ( const (
@ -103,10 +103,10 @@ func parent() error {
} }
sigC := make(chan os.Signal, 1) sigC := make(chan os.Signal, 1)
signal.Notify(sigC, syscall.SIGPIPE) signal.Notify(sigC, unix.SIGPIPE)
defer func() { defer func() {
// dummy signal to terminate the goroutine // dummy signal to terminate the goroutine
sigC <- syscall.SIGKILL sigC <- unix.SIGKILL
}() }()
go func() { go func() {
defer func() { defer func() {
@ -115,10 +115,10 @@ func parent() error {
}() }()
s := <-sigC s := <-sigC
if s == syscall.SIGPIPE { if s == unix.SIGPIPE {
if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil { if f, err := os.OpenFile("/dev/null", os.O_WRONLY, 0755); err == nil {
syscall.Dup2(int(f.Fd()), 1) // nolint:errcheck unix.Dup2(int(f.Fd()), 1) // nolint:errcheck
syscall.Dup2(int(f.Fd()), 2) // nolint:errcheck unix.Dup2(int(f.Fd()), 2) // nolint:errcheck
f.Close() f.Close()
} }
} }
@ -191,7 +191,7 @@ func parent() error {
}() }()
defer func() { defer func() {
if err := syscall.Kill(cmd.Process.Pid, syscall.SIGTERM); err != nil { if err := unix.Kill(cmd.Process.Pid, unix.SIGTERM); err != nil {
logrus.WithError(err).Warn("kill child process") logrus.WithError(err).Warn("kill child process")
} }
}() }()