diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-24 06:55:24 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-24 09:03:53 -0500 |
| commit | df99522c6794cbf9ea77c4c314dadf9e9b5b2a54 (patch) | |
| tree | f43b0228054882a212b9493f4fca9657918ab88d /pkg/spec | |
| parent | bbfe7341b7c03cba4a362ec1e1198ff3eb90d962 (diff) | |
| download | podman-df99522c6794cbf9ea77c4c314dadf9e9b5b2a54.tar.gz podman-df99522c6794cbf9ea77c4c314dadf9e9b5b2a54.tar.bz2 podman-df99522c6794cbf9ea77c4c314dadf9e9b5b2a54.zip | |
Fixes to handle /dev/shm correctly.
We had two problems with /dev/shm, first, you mount the
container read/only then /dev/shm was mounted read/only.
This is a bug a tmpfs directory should be read/write within
a read-only container.
The second problem is we were ignoring users mounted /dev/shm
from the host.
If user specified
podman run -d -v /dev/shm:/dev/shm ...
We were dropping this mount and still using the internal mount.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/spec.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index c90f16f7c..3d6603364 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -52,6 +52,8 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint if err != nil { return nil, err } + // Remove the default /dev/shm mount to ensure we overwrite it + g.RemoveMount("/dev/shm") g.HostSpecific = true addCgroup := true canMountSys := true |