diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-04 09:54:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 09:54:51 -0700 |
| commit | 3c31e176c7dfce3c86a45ff4750f740a5f8f9321 (patch) | |
| tree | 44bc916f3eda9d596b2a72ab1b9e706df04af356 | |
| parent | 7213ac81b0387854e4af9f8dcbb55fbe859ec6de (diff) | |
| parent | 87c255f29fcf4eb2fd21b21a1abe9d9fdcc7dbca (diff) | |
| download | podman-3c31e176c7dfce3c86a45ff4750f740a5f8f9321.tar.gz podman-3c31e176c7dfce3c86a45ff4750f740a5f8f9321.tar.bz2 podman-3c31e176c7dfce3c86a45ff4750f740a5f8f9321.zip | |
Merge pull request #1557 from rhatdan/systemd
Don't tmpcopyup on systemd cgroup
| -rw-r--r-- | pkg/spec/spec.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 1ad55fc8c..4c855d659 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -417,7 +417,7 @@ func setupSystemd(config *CreateConfig, g *generate.Generator) error { return err } options := []string{"rw", "rprivate", "noexec", "nosuid", "nodev"} - for _, dest := range []string{"/run", "/run/lock", "/sys/fs/cgroup/systemd"} { + for _, dest := range []string{"/run", "/run/lock"} { if libpod.MountExists(mounts, dest) { continue } @@ -441,6 +441,13 @@ func setupSystemd(config *CreateConfig, g *generate.Generator) error { } g.AddMount(tmpfsMnt) } + tmpfsMnt := spec.Mount{ + Destination: "/sys/fs/cgroup/systemd", + Type: "tmpfs", + Source: "tmpfs", + Options: append(options, "size=65536k"), + } + g.AddMount(tmpfsMnt) return nil } |