diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-06 17:31:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 17:31:04 +0200 |
| commit | 290def5b921ca4b557e051e79963de7f429cfcd7 (patch) | |
| tree | a22d5c52a9fb5555dafb097b92f6981ffe364a66 | |
| parent | 575ffee2f05dc607d32da2d0bfd1b82f47aab8bb (diff) | |
| parent | 77f9234513071ee2d94f206334d64d4b99249ab4 (diff) | |
| download | podman-290def5b921ca4b557e051e79963de7f429cfcd7.tar.gz podman-290def5b921ca4b557e051e79963de7f429cfcd7.tar.bz2 podman-290def5b921ca4b557e051e79963de7f429cfcd7.zip | |
Merge pull request #3960 from mheon/ignore_umount_enoent
Ignore ENOENT on umount of SHM
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
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 |