diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-02 13:47:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 13:47:12 -0400 |
| commit | fa487a65220951e84779f200f48780666b4b9209 (patch) | |
| tree | cb71124cb22c024cce904c91ba056a7047f04d78 /libpod | |
| parent | 37791d717f85c0621932aa18cd4c2477426a2de0 (diff) | |
| parent | d68a6b52ecd5354dccfb2f62dd7b06518200fa28 (diff) | |
| download | podman-fa487a65220951e84779f200f48780666b4b9209.tar.gz podman-fa487a65220951e84779f200f48780666b4b9209.tar.bz2 podman-fa487a65220951e84779f200f48780666b4b9209.zip | |
Merge pull request #7532 from rhatdan/run
We should not be mounting /run as noexec when run with --systemd
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index c61c1a325..f789b0069 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -563,7 +563,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { // systemd expects to have /run, /run/lock and /tmp on tmpfs // It also expects to be able to write to /sys/fs/cgroup/systemd and /var/log/journal func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) error { - options := []string{"rw", "rprivate", "noexec", "nosuid", "nodev"} + options := []string{"rw", "rprivate", "nosuid", "nodev"} for _, dest := range []string{"/run", "/run/lock"} { if MountExists(mounts, dest) { continue @@ -627,7 +627,7 @@ func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) erro Destination: "/sys/fs/cgroup/systemd", Type: "bind", Source: "/sys/fs/cgroup/systemd", - Options: []string{"bind", "nodev", "noexec", "nosuid", "rprivate"}, + Options: []string{"bind", "nodev", "nosuid", "rprivate"}, } g.AddMount(systemdMnt) g.AddLinuxMaskedPaths("/sys/fs/cgroup/systemd/release_agent") |