Merge pull request containers#3960 from mheon/ignore_umount_enoent

Ignore ENOENT on umount of SHM
mheon · Sep 6, 2019 · 290def5 · 290def5
2 parents 575ffee + 77f9234
commit 290def5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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