diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-11 15:01:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-11 15:01:00 -0400 |
| commit | 595c6ef2ba0595577e9060a3c3ae7a7aacdc94f6 (patch) | |
| tree | 806914922f8076b83672e27b76a4e999dbdb88a2 | |
| parent | d31a881587f9bf5884c66647271b1e32701ae133 (diff) | |
| parent | a064cfc99ba4f0e8d3a13ddeea76718f9e50b14e (diff) | |
| download | podman-595c6ef2ba0595577e9060a3c3ae7a7aacdc94f6.tar.gz podman-595c6ef2ba0595577e9060a3c3ae7a7aacdc94f6.tar.bz2 podman-595c6ef2ba0595577e9060a3c3ae7a7aacdc94f6.zip | |
Merge pull request #7281 from mheon/ensure_mountprop_systemd
Ensure correct propagation for cgroupsv1 systemd cgroup
| -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 9fb9738dc..e2bc4e50f 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -626,7 +626,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"}, + Options: []string{"bind", "nodev", "noexec", "nosuid", "rslave"}, } g.AddMount(systemdMnt) g.AddLinuxMaskedPaths("/sys/fs/cgroup/systemd/release_agent") |