diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 04:03:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 04:03:11 +0200 |
| commit | 32b49463d9f38e6bdf4ad521a4b11fa17d836050 (patch) | |
| tree | 15faad8564c59bc48339d6004066baf32b7a8ee7 | |
| parent | 5ececd8a0bb0615a8358c480797fd6db17ab1d7e (diff) | |
| parent | 912f952c1f549cf82c326d60585850b8343d4537 (diff) | |
| download | podman-32b49463d9f38e6bdf4ad521a4b11fa17d836050.tar.gz podman-32b49463d9f38e6bdf4ad521a4b11fa17d836050.tar.bz2 podman-32b49463d9f38e6bdf4ad521a4b11fa17d836050.zip | |
Merge pull request #7640 from rhatdan/systemd
Fix --systemd=always regression
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 3bdf28e8c..dde7cafb1 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -635,7 +635,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", "nosuid", "rprivate"}, + Options: []string{"bind", "nodev", "noexec", "nosuid", "rprivate"}, } g.AddMount(systemdMnt) g.AddLinuxMaskedPaths("/sys/fs/cgroup/systemd/release_agent") |