summaryrefslogtreecommitdiff
path: root/pkg/namespaces/namespaces.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2020-04-24 15:37:31 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2020-04-24 15:55:38 +0200
commit88f1994ab9a0bf3a8df3c8f74a39cd1db27c2070 (patch)
tree0cbd25a81bc2874613658dfe26db08db61d45795 /pkg/namespaces/namespaces.go
parent64d8b4eebb01c6647b0588475c785cdd075389d3 (diff)
downloadpodman-88f1994ab9a0bf3a8df3c8f74a39cd1db27c2070.tar.gz
podman-88f1994ab9a0bf3a8df3c8f74a39cd1db27c2070.tar.bz2
podman-88f1994ab9a0bf3a8df3c8f74a39cd1db27c2070.zip
podman: assume user namespace if there are mappings
if some mappings are specified, assume there is a private user namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/namespaces/namespaces.go')
-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 2cb3c3f20..2ffbde977 100644
--- a/pkg/namespaces/namespaces.go
+++ b/pkg/namespaces/namespaces.go
@@ -31,7 +31,7 @@ func (n CgroupMode) IsHost() bool {
// IsDefaultValue indicates whether the cgroup namespace has the default value.
func (n CgroupMode) IsDefaultValue() bool {
- return n == ""
+ return n == "" || n == defaultType
}
// IsNS indicates a cgroup namespace passed in by path (ns:<path>)
@@ -102,6 +102,11 @@ func (n UsernsMode) IsAuto() bool {
return parts[0] == "auto"
}
+// IsDefaultValue indicates whether the user namespace has the default value.
+func (n UsernsMode) IsDefaultValue() bool {
+ return n == "" || n == defaultType
+}
+
// GetAutoOptions returns a AutoUserNsOptions with the settings to setup automatically
// a user namespace.
func (n UsernsMode) GetAutoOptions() (*storage.AutoUserNsOptions, error) {