summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-03-09 09:25:12 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-03-09 09:25:56 -0400
commit6be87b21862888e88daa2bc502ea84123d64850b (patch)
tree85a1414dcb284c33d414b4ccc75ad5d39880d53c /libpod
parent6b3f447c8ec8ac385160234308d7fdeaf6b127e6 (diff)
downloadpodman-6be87b21862888e88daa2bc502ea84123d64850b.tar.gz
podman-6be87b21862888e88daa2bc502ea84123d64850b.tar.bz2
podman-6be87b21862888e88daa2bc502ea84123d64850b.zip
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 <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_api.go6
1 files changed, 0 insertions, 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)
}