opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 03:52:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7346 from rhatdan/systemd

Browse Source 
Don't limit the size on /run for systemd based containers
This commit is contained in:
OpenShift Merge Robot
2020-08-19 21:43:00 +02:00
committed by GitHub
parent 9babd21dfc bd63a252f3
commit dcdb6474d6
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/common/volumes.go
View File

@ -88,17 +88,11 @@ func parseVolumes(volumeFlag, mountFlag, tmpfsFlag []string, addReadOnlyTmpfs bo
if _, ok := unifiedVolumes[dest]; ok { if _, ok := unifiedVolumes[dest]; ok {
continue continue
} }
localOpts := options
if dest == "/run" {
localOpts = append(localOpts, "noexec", "size=65536k")
} else {
localOpts = append(localOpts, "exec")
}
unifiedMounts[dest] = spec.Mount{ unifiedMounts[dest] = spec.Mount{
Destination: dest, Destination: dest,
Type: TypeTmpfs, Type: TypeTmpfs,
Source: "tmpfs", Source: "tmpfs",
Options: localOpts, Options: options,
} }
} }
} }

2
libpod/container_internal_linux.go
View File

@ -571,7 +571,7 @@ func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) erro
Destination: dest, Destination: dest,
Type: "tmpfs", Type: "tmpfs",
Source: "tmpfs", Source: "tmpfs",
Options: append(options, "tmpcopyup", "size=65536k"), Options: append(options, "tmpcopyup"),
} }
g.AddMount(tmpfsMnt) g.AddMount(tmpfsMnt)
} }