diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-09 10:09:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 10:09:14 +0200 |
| commit | 79f30af384cf6c74f89c3b44c01707da22d867e5 (patch) | |
| tree | 23743436c054a1de091ae7d0ecb008d066786360 /libpod/define | |
| parent | a85e97952994a2803a17ee2a384b260115f18b43 (diff) | |
| parent | 9d964ffb9fc98ed13f6fec974c917b84c175d39a (diff) | |
| download | podman-79f30af384cf6c74f89c3b44c01707da22d867e5.tar.gz podman-79f30af384cf6c74f89c3b44c01707da22d867e5.tar.bz2 podman-79f30af384cf6c74f89c3b44c01707da22d867e5.zip | |
Merge pull request #6520 from mheon/no_conmon_no_error
Ensure Conmon is alive before waiting for exit file
Diffstat (limited to 'libpod/define')
| -rw-r--r-- | libpod/define/errors.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/define/errors.go b/libpod/define/errors.go index 16df2a1cc..083553b7e 100644 --- a/libpod/define/errors.go +++ b/libpod/define/errors.go @@ -141,6 +141,9 @@ var ( // ErrConmonOutdated indicates the version of conmon found (whether via the configuration or $PATH) // is out of date for the current podman version ErrConmonOutdated = errors.New("outdated conmon version") + // ErrConmonDead indicates that the container's conmon process has been + // killed, preventing normal operation. + ErrConmonDead = errors.New("conmon process killed") // ErrImageInUse indicates the requested operation failed because the image was in use ErrImageInUse = errors.New("image is being used") |