summaryrefslogtreecommitdiff
path: root/pkg/namespaces
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-28 06:18:28 -0800
committerGitHub <noreply@github.com>2018-11-28 06:18:28 -0800
commitd346996e1512ef6efb3800d6cb762d0409d12459 (patch)
treea5f9496bffe3df5a46627f56c0fee08aafdfee55 /pkg/namespaces
parent2a496aea30da4bbe4981753c11ed095867202466 (diff)
parent95f22a2ca055d6dec0281cee109375dc4fd9b78b (diff)
downloadpodman-d346996e1512ef6efb3800d6cb762d0409d12459.tar.gz
podman-d346996e1512ef6efb3800d6cb762d0409d12459.tar.bz2
podman-d346996e1512ef6efb3800d6cb762d0409d12459.zip
Merge pull request #1849 from giuseppe/report-rootless-netmode
rootless: add new netmode "slirp4netns"
Diffstat (limited to 'pkg/namespaces')
-rw-r--r--pkg/namespaces/namespaces.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/namespaces/namespaces.go b/pkg/namespaces/namespaces.go
index bee833fa9..832efd554 100644
--- a/pkg/namespaces/namespaces.go
+++ b/pkg/namespaces/namespaces.go
@@ -223,7 +223,12 @@ func (n NetworkMode) IsBridge() bool {
return n == "bridge"
}
+// IsSlirp4netns indicates if we are running a rootless network stack
+func (n NetworkMode) IsSlirp4netns() bool {
+ return n == "slirp4netns"
+}
+
// IsUserDefined indicates user-created network
func (n NetworkMode) IsUserDefined() bool {
- return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer()
+ return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer() && !n.IsSlirp4netns()
}