opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2186 from giuseppe/rootless-fix-pid-host

Browse Source 
rootless: fix --pid=host without --privileged
This commit is contained in:
OpenShift Merge Robot
2019-01-18 19:29:50 +01:00
committed by GitHub
parent 27de1c19e9 8156f8c694
commit 37002ad549
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/spec/spec.go
View File

@ -376,6 +376,10 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint
}
func blockAccessToKernelFilesystems(config *CreateConfig, g *generate.Generator) {
if config.PidMode.IsHost() && rootless.IsRootless() {
return
}
if !config.Privileged {
for _, mp := range []string{
"/proc/acpi",

4
test/e2e/rootless_test.go
View File

@ -276,6 +276,10 @@ var _ = Describe("Podman rootless", func() {
runRootlessHelper([]string{"--net", "host"})
})
It("podman rootless rootfs --pid host", func() {
runRootlessHelper([]string{"--pid", "host"})
})
It("podman rootless rootfs --privileged", func() {
runRootlessHelper([]string{"--privileged"})
})