summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-08-22 11:30:50 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-08-28 14:28:18 -0400
commitd45595d9cc2ae60a5e23d081e27a8ba0ab952113 (patch)
tree3c263462e0e5701eb58ac48e313da86c8b4048f6
parent02264d597faa034c14393ab6c98591e85a2642ee (diff)
downloadpodman-d45595d9cc2ae60a5e23d081e27a8ba0ab952113.tar.gz
podman-d45595d9cc2ae60a5e23d081e27a8ba0ab952113.tar.bz2
podman-d45595d9cc2ae60a5e23d081e27a8ba0ab952113.zip
Don't double-process tmpfs options
We already process the options on all tmpfs filesystems during final addition of mounts to the spec. We don't need to do it before that in parseVolumes. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--pkg/spec/storage.go10
1 files changed, 0 insertions, 10 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go
index bc06945f0..9f4248924 100644
--- a/pkg/spec/storage.go
+++ b/pkg/spec/storage.go
@@ -195,16 +195,6 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount,
// Final step: maps to arrays
finalMounts := make([]spec.Mount, 0, len(baseMounts))
for _, mount := range baseMounts {
- // All user-added tmpfs mounts need their options processed.
- // Exception: mounts added by the ReadOnlyTmpfs option, which
- // contain several exceptions to normal options rules.
- if mount.Type == TypeTmpfs {
- opts, err := util.ProcessOptions(mount.Options, true)
- if err != nil {
- return nil, nil, err
- }
- mount.Options = opts
- }
if mount.Type == TypeBind {
absSrc, err := filepath.Abs(mount.Source)
if err != nil {