diff options
author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-24 14:54:43 +0200 |
---|---|---|
committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-04-24 15:03:50 +0200 |
commit | 64d8b4eebb01c6647b0588475c785cdd075389d3 (patch) | |
tree | 3599df29a94df5298f783b39dbacd5957f291497 /pkg/specgen/namespaces.go | |
parent | 81c7a2444cb5cbf8b8911cdb59446a239f89168c (diff) | |
download | podman-64d8b4eebb01c6647b0588475c785cdd075389d3.tar.gz podman-64d8b4eebb01c6647b0588475c785cdd075389d3.tar.bz2 podman-64d8b4eebb01c6647b0588475c785cdd075389d3.zip |
podman: implement userns=keep-id
add missing implementation for userns=keep-id and enable the user
namespaces tests.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/specgen/namespaces.go')
-rw-r--r-- | pkg/specgen/namespaces.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkg/specgen/namespaces.go b/pkg/specgen/namespaces.go index fffbd6d9e..cee49ff51 100644 --- a/pkg/specgen/namespaces.go +++ b/pkg/specgen/namespaces.go @@ -76,6 +76,17 @@ func (n *Namespace) IsPod() bool { func (n *Namespace) IsPrivate() bool { return n.NSMode == Private } + +// IsAuto indicates the namespace is auto +func (n *Namespace) IsAuto() bool { + return n.NSMode == Auto +} + +// IsKeepID indicates the namespace is KeepID +func (n *Namespace) IsKeepID() bool { + return n.NSMode == KeepID +} + func validateUserNS(n *Namespace) error { if n == nil { return nil @@ -186,12 +197,11 @@ func ParseUserNamespace(ns string) (Namespace, error) { if len(split) != 2 { return toReturn, errors.Errorf("invalid setting for auto: mode") } - toReturn.NSMode = KeepID + toReturn.NSMode = Auto toReturn.Value = split[1] return toReturn, nil case ns == "keep-id": toReturn.NSMode = KeepID - toReturn.NSMode = FromContainer return toReturn, nil } return ParseNamespace(ns) |