containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7640 from rhatdan/systemd 

Fix --systemd=always regression
This commit is contained in:
OpenShift Merge Robot 2020-09-16 04:03:11 +02:00 committed by GitHub
parent 5ececd8a0b 912f952c1f
commit 32b49463d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal_linux.go
View File

@ -635,7 +635,7 @@ func (c *Container) setupSystemd(mounts []spec.Mount, g generate.Generator) erro
Destination: "/sys/fs/cgroup/systemd", Destination: "/sys/fs/cgroup/systemd",
Type: "bind", Type: "bind",
Source: "/sys/fs/cgroup/systemd", Source: "/sys/fs/cgroup/systemd",
Options: []string{"bind", "nodev", "nosuid", "rprivate"}, Options: []string{"bind", "nodev", "noexec", "nosuid", "rprivate"},
} }
g.AddMount(systemdMnt) g.AddMount(systemdMnt)
g.AddLinuxMaskedPaths("/sys/fs/cgroup/systemd/release_agent") g.AddLinuxMaskedPaths("/sys/fs/cgroup/systemd/release_agent")