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_linux.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_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 93d20491e..0745b7732 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -210,9 +210,6 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { g.SetProcessSelinuxLabel(c.ProcessLabel()) g.SetLinuxMountLabel(c.MountLabel()) - // Remove the default /dev/shm mount to ensure we overwrite it - g.RemoveMount("/dev/shm") - // Add bind mounts to container for dstPath, srcPath := range c.state.BindMounts { newMount := spec.Mount{ @@ -221,7 +218,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { Destination: dstPath, Options: []string{"bind", "private"}, } - if c.IsReadOnly() { + if c.IsReadOnly() && dstPath != "/dev/shm" { newMount.Options = append(newMount.Options, "ro") } if !MountExists(g.Mounts(), dstPath) { |