diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-06 20:09:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 20:09:04 +0200 |
| commit | 470e52f272a4a8541e867fb2c6477e722175066c (patch) | |
| tree | dd50e4672729412a0ceb9cd30d83cf7a9726e965 /libpod/oci_conmon_linux.go | |
| parent | 03c17e94078236531b02ab437721853a09df119f (diff) | |
| parent | 8bd9f58d1d0db76406dca53907095648f4091f9f (diff) | |
| download | podman-470e52f272a4a8541e867fb2c6477e722175066c.tar.gz podman-470e52f272a4a8541e867fb2c6477e722175066c.tar.bz2 podman-470e52f272a4a8541e867fb2c6477e722175066c.zip | |
Merge pull request #11878 from mheon/stop_stopping
Allow `podman stop` to be run on Stopping containers
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 29ec4a92a..0369a9977 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -351,6 +351,12 @@ func (r *ConmonOCIRuntime) UpdateContainerStatus(ctr *Container) error { return ctr.handleExitFile(exitFile, fi) } + // Handle ContainerStateStopping - keep it unless the container + // transitioned to no longer running. + if oldState == define.ContainerStateStopping && (ctr.state.State == define.ContainerStatePaused || ctr.state.State == define.ContainerStateRunning) { + ctr.state.State = define.ContainerStateStopping + } + return nil } |