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

Revert "spec: bind mount /sys only for rootless containers" 

It breaks "podman  run --net=host --uidmap=0:1:70000 --gidmap=0:20000:70000 busybox echo hi"

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1285
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano 2018-08-16 17:31:09 +02:00 committed by Atomic Bot
parent 1003df3444
commit c0abfaa7c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/spec/spec.go
View File

@ -35,7 +35,7 @@ func CreateConfigToOCISpec(config *CreateConfig) (*spec.Spec, error) { //nolint
Options: []string{"nosuid", "noexec", "nodev", "rw"}, Options: []string{"nosuid", "noexec", "nodev", "rw"},
} }
g.AddMount(sysMnt) g.AddMount(sysMnt)
} else if rootless.IsRootless() && !config.UsernsMode.IsHost() && config.NetMode.IsHost() { } else if !config.UsernsMode.IsHost() && config.NetMode.IsHost() {
addCgroup = false addCgroup = false
g.RemoveMount("/sys") g.RemoveMount("/sys")
sysMnt := spec.Mount{ sysMnt := spec.Mount{