diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-04 11:11:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 11:11:01 -0500 |
| commit | 83895524959750e16da2fd43b9da6389b4e20b46 (patch) | |
| tree | ece55b81c619e8f0a3ef004f588515e52d79eec1 /libpod/oci_attach_linux.go | |
| parent | ce7ed2205a6a2a4557b14a3e1e818839c7c8bbfd (diff) | |
| parent | d3d97a25e8c87cf741b2e24ac01ef84962137106 (diff) | |
| download | podman-83895524959750e16da2fd43b9da6389b4e20b46.tar.gz podman-83895524959750e16da2fd43b9da6389b4e20b46.tar.bz2 podman-83895524959750e16da2fd43b9da6389b4e20b46.zip | |
Merge pull request #5373 from haircommander/exec-pipe-ec
exec: get the exit code from sync pipe instead of file
Diffstat (limited to 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 46c70e7eb..5a8198d05 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -119,8 +119,8 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c socketPath := buildSocketPath(sockPath) // 2: read from attachFd that the parent process has set up the console socket - if _, err := readConmonPipeData(attachFd, ""); err != nil { - return err + if pipeData := readConmonPipeData(attachFd, ""); pipeData.err != nil { + return pipeData.err } // 2: then attach |