summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-16 23:34:16 +0200
committerGitHub <noreply@github.com>2019-09-16 23:34:16 +0200
commit1a1ff98896066d82d800e5a09e1461825ad12a09 (patch)
tree63274639e506676d16daaf8980f5c151d8542422
parent42e080bcd342f4a3032fb9921b38b4e711900d52 (diff)
parentcabe1345f8d8462421853c864c6d8a898713986c (diff)
downloadpodman-1a1ff98896066d82d800e5a09e1461825ad12a09.tar.gz
podman-1a1ff98896066d82d800e5a09e1461825ad12a09.tar.bz2
podman-1a1ff98896066d82d800e5a09e1461825ad12a09.zip
Merge pull request #4035 from mheon/unmount_unmounted_is_safe
Unmounting a container that is already unmounted is OK
-rw-r--r--libpod/container_internal.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 6bf8439da..8b96b3f62 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1368,7 +1368,7 @@ func (c *Container) cleanupStorage() error {
// error
// We still want to be able to kick the container out of the
// state
- if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown {
+ if errors.Cause(err) == storage.ErrNotAContainer || errors.Cause(err) == storage.ErrContainerUnknown || errors.Cause(err) == storage.ErrLayerNotMounted {
logrus.Errorf("Storage for container %s has been removed", c.ID())
} else {
if cleanupErr != nil {