diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:48:47 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-03-09 09:50:40 -0400 |
| commit | ffce869daa6c4956bc1509b7b10726a266b74741 (patch) | |
| tree | 617093cb3f3b533bc9957f6dfe3b8fe5a7e40c7c /libpod/container_api.go | |
| parent | 6be87b21862888e88daa2bc502ea84123d64850b (diff) | |
| download | podman-ffce869daa6c4956bc1509b7b10726a266b74741.tar.gz podman-ffce869daa6c4956bc1509b7b10726a266b74741.tar.bz2 podman-ffce869daa6c4956bc1509b7b10726a266b74741.zip | |
Revert "Exec: use ErrorConmonRead"
This reverts commit d3d97a25e8c87cf741b2e24ac01ef84962137106.
This does not resolve the issues we expected it would, and has
some unexpected side effects with the upcoming exec rework.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/container_api.go')
| -rw-r--r-- | libpod/container_api.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/container_api.go b/libpod/container_api.go index fc6cc4a49..e5174c02c 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -297,9 +297,7 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri // Conmon will pass a non-zero exit code from the runtime as a pid here. // we differentiate a pid with an exit code by sending it as negative, so reverse // that change and return the exit code the runtime failed with. - // Make sure the value is not ErrorConmonRead, as that is a podman set bogus value - // and not sent by conmon (and thus has no special meaning) - if pid < 0 && pid != define.ErrorConmonRead { + if pid < 0 { ec = -1 * pid } return ec, err |