summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-07 11:38:18 -0500
committerGitHub <noreply@github.com>2020-12-07 11:38:18 -0500
commitaac03d4a329580634c4c086352b1e0c4023937f4 (patch)
treeedc5bab9565113ae7f9838539dd01add00ebd157 /pkg
parent225907536f52d672284151e00e00767a9588c8fc (diff)
parent95c45773d7dbca2880152de681c81f0a2afec99b (diff)
downloadpodman-aac03d4a329580634c4c086352b1e0c4023937f4.tar.gz
podman-aac03d4a329580634c4c086352b1e0c4023937f4.tar.bz2
podman-aac03d4a329580634c4c086352b1e0c4023937f4.zip
Merge pull request #8561 from mheon/fix_gating
Do not mount sysfs as rootless in more cases
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/oci.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index 0368ab205..c24dcf4c0 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -165,7 +165,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
inUserNS = true
}
}
- if inUserNS && s.NetNS.IsHost() {
+ if inUserNS && s.NetNS.NSMode != specgen.NoNetwork {
canMountSys = false
}