aboutsummaryrefslogtreecommitdiff
path: root/pkg/specgen/generate/oci.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-07 17:28:28 -0500
committerGitHub <noreply@github.com>2020-12-07 17:28:28 -0500
commit23d2deed30c2491a2cf59644324f27c9eebf7ba4 (patch)
treee191f6ea97f53e22f9b43e04900fe9df1e65eef9 /pkg/specgen/generate/oci.go
parent4c424e845239aef6e8cdab93dc19f55f4314513c (diff)
parent33bde4569ccb65b447150894c56f9a351a09a471 (diff)
downloadpodman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.gz
podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.tar.bz2
podman-23d2deed30c2491a2cf59644324f27c9eebf7ba4.zip
Merge pull request #8640 from mheon/221_backports
Backports for v2.2.1
Diffstat (limited to 'pkg/specgen/generate/oci.go')
-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 8454458a8..9649873fd 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
}