From ffce869daa6c4956bc1509b7b10726a266b74741 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 9 Mar 2020 09:48:47 -0400 Subject: 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 --- libpod/container_api.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libpod/container_api.go') 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 -- cgit v1.2.3-54-g00ecf