diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-08-23 19:05:16 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-08-28 14:28:18 -0400 |
| commit | 96812dc490dbd00b0ec6280353a4e78ba79b44b8 (patch) | |
| tree | 9205756a59c278a7d1e6dcd5409549e8a8b62978 /pkg | |
| parent | 820e242e821efda218031b75fce01625a20baa54 (diff) | |
| download | podman-96812dc490dbd00b0ec6280353a4e78ba79b44b8.tar.gz podman-96812dc490dbd00b0ec6280353a4e78ba79b44b8.tar.bz2 podman-96812dc490dbd00b0ec6280353a4e78ba79b44b8.zip | |
Fix addition of mount options when using RO tmpfs
For read-only containers set to create tmpfs filesystems over
/run and other common destinations, we were incorrectly setting
mount options, resulting in duplicate mount options.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/spec/storage.go | 6 | ||||
| -rw-r--r-- | pkg/util/mountOpts.go | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index 7ed21a055..bc0eaad6d 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -163,14 +163,16 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount, // If requested, add tmpfs filesystems for read-only containers. if config.ReadOnlyRootfs && config.ReadOnlyTmpfs { readonlyTmpfs := []string{"/tmp", "/var/tmp", "/run"} - options := []string{"rw", "rprivate", "exec", "nosuid", "nodev", "tmpcopyup"} + options := []string{"rw", "rprivate", "nosuid", "nodev", "tmpcopyup"} for _, dest := range readonlyTmpfs { if _, ok := baseMounts[dest]; ok { continue } localOpts := options if dest == "/run" { - localOpts = append(localOpts, "dev", "suid", "noexec", "size=65536k") + localOpts = append(localOpts, "noexec", "size=65536k") + } else { + localOpts = append(localOpts, "exec") } baseMounts[dest] = spec.Mount{ Destination: dest, diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index 9e387ce95..670daeaf9 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -10,7 +10,7 @@ var ( // ErrBadMntOption indicates that an invalid mount option was passed. ErrBadMntOption = errors.Errorf("invalid mount option") // ErrDupeMntOption indicates that a duplicate mount option was passed. - ErrDupeMntOption = errors.Errorf("duplicate option passed") + ErrDupeMntOption = errors.Errorf("duplicate mount option passed") ) // DefaultMountOptions sets default mount options for ProcessOptions. |