From 48530acbd9a622cf88dbbb10cbc8e91575c476e5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 22 Apr 2020 12:38:19 +0200 Subject: podman: handle namespaces specified on the CLI and handle differently the user namespace as it supports additional options. Signed-off-by: Giuseppe Scrivano --- pkg/specgen/generate/namespaces.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkg/specgen/generate/namespaces.go') diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 4ec1e859c..2aaeb9513 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -58,8 +58,7 @@ func GetDefaultNamespaceMode(nsType string, cfg *config.Config, pod *libpod.Pod) case "uts": return specgen.ParseNamespace(cfg.Containers.UTSNS) case "user": - // TODO: This may not work for --userns=auto - return specgen.ParseNamespace(cfg.Containers.UserNS) + return specgen.ParseUserNamespace(cfg.Containers.UserNS) case "net": ns, _, err := specgen.ParseNetworkNamespace(cfg.Containers.NetNS) return ns, err -- cgit v1.2.3-54-g00ecf