diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:49:27 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:50:55 -0400 |
| commit | 521ff14d83e387f39058c65361a68d83edae61ba (patch) | |
| tree | aa96412a8edff1efdce26dd4d03c31df3f72a867 /libpod/oci_attach_linux.go | |
| parent | ffce869daa6c4956bc1509b7b10726a266b74741 (diff) | |
| download | podman-521ff14d83e387f39058c65361a68d83edae61ba.tar.gz podman-521ff14d83e387f39058c65361a68d83edae61ba.tar.bz2 podman-521ff14d83e387f39058c65361a68d83edae61ba.zip | |
Revert "exec: get the exit code from sync pipe instead of file"
This reverts commit 4b72f9e4013411208751df2a92ab9f322d4da5b2.
Continues what began with revert of
d3d97a25e8c87cf741b2e24ac01ef84962137106 in previous commit.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
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 5a8198d05..46c70e7eb 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 pipeData := readConmonPipeData(attachFd, ""); pipeData.err != nil { - return pipeData.err + if _, err := readConmonPipeData(attachFd, ""); err != nil { + return err } // 2: then attach |