diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-07 09:36:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-07 09:36:03 -0800 |
| commit | ae031378619ba78bcd22a3c2ee9b276506c1dbd3 (patch) | |
| tree | cd35959d810a754f9c300764561edaa944c84b26 /libpod/runtime_ctr.go | |
| parent | 1e1aaac97d795b5c94f3c714d3d240d48c5efb97 (diff) | |
| parent | 536af1f68944c68956e705d589e11cd52875273a (diff) | |
| download | podman-ae031378619ba78bcd22a3c2ee9b276506c1dbd3.tar.gz podman-ae031378619ba78bcd22a3c2ee9b276506c1dbd3.tar.bz2 podman-ae031378619ba78bcd22a3c2ee9b276506c1dbd3.zip | |
Merge pull request #1689 from mheon/add_runc_timeout
Do not call out to runc for sync
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index b63726f29..09dc7c48b 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -256,7 +256,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool) } // Need to update container state to make sure we know it's stopped - if err := c.syncContainer(); err != nil { + if err := c.waitForExitFileAndSync(); err != nil { return err } } else if !(c.state.State == ContainerStateConfigured || |