diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-19 21:43:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 21:43:00 +0200 |
| commit | dcdb6474d6a65adce084da546fda7a93b5267c9b (patch) | |
| tree | 9c31bfa2671c63202b3ced8cdfe1b01edd867030 | |
| parent | 9babd21dfc263b0a63fc96eec0de2a6d0d834ab5 (diff) | |
| parent | bd63a252f3095274e35c9ab2f5d51f833dd89619 (diff) | |
| download | podman-dcdb6474d6a65adce084da546fda7a93b5267c9b.tar.gz podman-dcdb6474d6a65adce084da546fda7a93b5267c9b.tar.bz2 podman-dcdb6474d6a65adce084da546fda7a93b5267c9b.zip | |
Merge pull request #7346 from rhatdan/systemd
Don't limit the size on /run for systemd based containers
| -rw-r--r-- | cmd/podman/common/volumes.go | 8 | ||||
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go index 20c31bd81..ca0b10765 100644 --- a/cmd/podman/common/volumes.go +++ b/cmd/podman/common/volumes.go @@ -88,17 +88,11 @@ func parseVolumes(volumeFlag, mountFlag, tmpfsFlag []string, addReadOnlyTmpfs bo if _, ok := unifiedVolumes[dest]; ok { continue } - localOpts := options - if dest == "/run" { - localOpts = append(localOpts, "noexec", "size=65536k") - } else { - localOpts = append(localOpts, "exec") - } unifiedMounts[dest] = spec.Mount{ Destination: dest, Type: TypeTmpfs, Source: "tmpfs", - Options: localOpts, + Options: options, } } } diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index fdee3877c..ea4340e00 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -571,7 +571,7 @@ func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) erro Destination: dest, Type: "tmpfs", Source: "tmpfs", - Options: append(options, "tmpcopyup", "size=65536k"), + Options: append(options, "tmpcopyup"), } g.AddMount(tmpfsMnt) } |