summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-04-14 09:53:58 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-04-14 09:54:15 +0200
commit5e6065d9ac1f7c08ddd86c0c5ebb355e7628f9bf (patch)
tree6f33b06524aad6126a0a357b83624a7fd0e791ab
parentb9260053e94f2b4a00dbe7eba67fd195018bf94a (diff)
downloadpodman-5e6065d9ac1f7c08ddd86c0c5ebb355e7628f9bf.tar.gz
podman-5e6065d9ac1f7c08ddd86c0c5ebb355e7628f9bf.tar.bz2
podman-5e6065d9ac1f7c08ddd86c0c5ebb355e7628f9bf.zip
oci: fix umount of /sys/kernel
if the mount was already umounted as part of the cleanup (i.e. being a submount), the umount would fail. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--libpod/oci_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go
index 01f7c3649..1f5411c1f 100644
--- a/libpod/oci_linux.go
+++ b/libpod/oci_linux.go
@@ -133,7 +133,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string, restor
continue
}
err = unix.Unmount(m.Mountpoint, 0)
- if err != nil {
+ if err != nil && !os.IsNotExist(err) {
return errors.Wrapf(err, "cannot unmount %s", m.Mountpoint)
}
}