summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-09-06 10:25:53 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-09-06 10:25:53 -0400
commit77f9234513071ee2d94f206334d64d4b99249ab4 (patch)
tree83f2021b6c17e51995187ab3a9919fcfc2b174ef
parent88980859eccacf7a5752952b4dfba6d25374ec2d (diff)
downloadpodman-77f9234513071ee2d94f206334d64d4b99249ab4.tar.gz
podman-77f9234513071ee2d94f206334d64d4b99249ab4.tar.bz2
podman-77f9234513071ee2d94f206334d64d4b99249ab4.zip
Ignore ENOENT on umount of SHM
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--libpod/container_internal_linux.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index a84db9aa5..e96af8536 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -50,10 +50,10 @@ func (c *Container) mountSHM(shmOptions string) error {
func (c *Container) unmountSHM(mount string) error {
if err := unix.Unmount(mount, 0); err != nil {
- if err != syscall.EINVAL {
+ if err != syscall.EINVAL && err != syscall.ENOENT {
return errors.Wrapf(err, "error unmounting container %s SHM mount %s", c.ID(), mount)
}
- // If it's just an EINVAL, debug logs only
+ // If it's just an EINVAL or ENOENT, debug logs only
logrus.Debugf("container %s failed to unmount %s : %v", c.ID(), mount, err)
}
return nil