diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-14 20:13:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 20:13:28 +0100 |
| commit | 7e713ff336b8dd48b6fd75b16c92e6a35579355d (patch) | |
| tree | 84a9d3e1a7520aa34e8ecb1b49adf3aac5636694 /pkg/adapter | |
| parent | 0668483cf04bc7089ed176fb0b6700aebf80aaf9 (diff) | |
| parent | 85b7374491e842c44bec3ce5ec800794cae10295 (diff) | |
| download | podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.tar.gz podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.tar.bz2 podman-7e713ff336b8dd48b6fd75b16c92e6a35579355d.zip | |
Merge pull request #5209 from vrothberg/un-docker
Undocker part 1)
Diffstat (limited to 'pkg/adapter')
| -rw-r--r-- | pkg/adapter/sigproxy_linux.go | 4 | ||||
| -rw-r--r-- | pkg/adapter/terminal.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/adapter/sigproxy_linux.go b/pkg/adapter/sigproxy_linux.go index 35745a6aa..8295e4250 100644 --- a/pkg/adapter/sigproxy_linux.go +++ b/pkg/adapter/sigproxy_linux.go @@ -5,7 +5,7 @@ import ( "syscall" "github.com/containers/libpod/libpod" - "github.com/docker/docker/pkg/signal" + "github.com/containers/libpod/pkg/signal" "github.com/sirupsen/logrus" ) @@ -20,7 +20,7 @@ func ProxySignals(ctr *libpod.Container) { for s := range sigBuffer { // Ignore SIGCHLD and SIGPIPE - these are mostly likely // intended for the podman command itself. - if s == signal.SIGCHLD || s == signal.SIGPIPE { + if s == syscall.SIGCHLD || s == syscall.SIGPIPE { continue } diff --git a/pkg/adapter/terminal.go b/pkg/adapter/terminal.go index 51b747d23..499e77def 100644 --- a/pkg/adapter/terminal.go +++ b/pkg/adapter/terminal.go @@ -3,9 +3,9 @@ package adapter import ( "context" "os" - gosignal "os/signal" + "os/signal" - "github.com/docker/docker/pkg/signal" + lsignal "github.com/containers/libpod/pkg/signal" "github.com/docker/docker/pkg/term" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -33,7 +33,7 @@ func getResize() *remotecommand.TerminalSize { // Helper for prepareAttach - set up a goroutine to generate terminal resize events func resizeTty(ctx context.Context, resize chan remotecommand.TerminalSize) { sigchan := make(chan os.Signal, 1) - gosignal.Notify(sigchan, signal.SIGWINCH) + signal.Notify(sigchan, lsignal.SIGWINCH) go func() { defer close(resize) // Update the terminal size immediately without waiting |