diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-24 08:43:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-24 08:43:10 -0800 |
| commit | c50332d057a148f6ffa7879e99e969cf97af9878 (patch) | |
| tree | f43b0228054882a212b9493f4fca9657918ab88d /libpod/container_internal.go | |
| parent | bbfe7341b7c03cba4a362ec1e1198ff3eb90d962 (diff) | |
| parent | df99522c6794cbf9ea77c4c314dadf9e9b5b2a54 (diff) | |
| download | podman-c50332d057a148f6ffa7879e99e969cf97af9878.tar.gz podman-c50332d057a148f6ffa7879e99e969cf97af9878.tar.bz2 podman-c50332d057a148f6ffa7879e99e969cf97af9878.zip | |
Merge pull request #2051 from rhatdan/shm
Fixes to handle /dev/shm correctly.
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 3217b2421..928be52ae 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -851,7 +851,7 @@ func (c *Container) mountStorage() (string, error) { return "", errors.Wrapf(err, "unable to determine if %q is mounted", c.config.ShmDir) } - if !mounted { + if !mounted && !MountExists(c.config.Spec.Mounts, "/dev/shm") { shmOptions := fmt.Sprintf("mode=1777,size=%d", c.config.ShmSize) if err := c.mountSHM(shmOptions); err != nil { return "", err |