From 6be87b21862888e88daa2bc502ea84123d64850b Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 9 Mar 2020 09:25:12 -0400 Subject: Revert "exec: fix error code when conmon fails" This reverts commit 4632b81c81a73025a960e339f40bc805f8a6c70a. We are reverting #5373 as well, which lays the foundation for this commit, so it has to go as well. Signed-off-by: Matthew Heon --- libpod/container_api.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libpod/container_api.go b/libpod/container_api.go index 5e8fcea47..fc6cc4a49 100644 --- a/libpod/container_api.go +++ b/libpod/container_api.go @@ -340,12 +340,6 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri if lastErr != nil { logrus.Errorf(lastErr.Error()) } - // ErrorConmonRead is a bogus value set by podman to indicate reading a value from - // conmon failed. Since it is specifically not a valid exit code, we should set - // a generic error here - if exitCodeData.data == define.ErrorConmonRead { - exitCodeData.data = define.ExecErrorCodeGeneric - } lastErr = errors.Wrapf(define.ErrOCIRuntime, "non zero exit code: %d", exitCodeData.data) } -- cgit v1.2.3-54-g00ecf