diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-06 21:44:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-06 21:44:04 +0200 |
| commit | ea3e7ef0733dfc010606fdc8fc631e1d17866349 (patch) | |
| tree | 1834d1d2b050c35226c08d0bd7526ff9bbc9e264 /libpod | |
| parent | db5ec4dcdc4d9b1105d1ce66cb3704fda328dec3 (diff) | |
| parent | 9585147e1e281ffa35f94d2fecdf8ad6f76faaf7 (diff) | |
| download | podman-ea3e7ef0733dfc010606fdc8fc631e1d17866349.tar.gz podman-ea3e7ef0733dfc010606fdc8fc631e1d17866349.tar.bz2 podman-ea3e7ef0733dfc010606fdc8fc631e1d17866349.zip | |
Merge pull request #15654 from tyler92/fix-ctr-remove-after-power-off
fix Pod removal after OS hard shutdown
Diffstat (limited to 'libpod')
| -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 1e1b7dad5..fb4f80aa6 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -798,7 +798,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo // Deallocate the container's lock if err := c.lock.Free(); err != nil { - if cleanupErr == nil { + if cleanupErr == nil && !os.IsNotExist(err) { cleanupErr = fmt.Errorf("error freeing lock for container %s: %w", c.ID(), err) } else { logrus.Errorf("Free container lock: %v", err) |