diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-06 14:51:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 14:51:22 +0000 |
| commit | ca5bebb0825a738ee04c073646696906db95c97c (patch) | |
| tree | edc2990099171183914478cb101ce1562bdf95c2 /pkg/specgen/generate/namespaces.go | |
| parent | 49df3cc5cb7e6a1d9e28cacfa86562abbdf48fd9 (diff) | |
| parent | 8f2d9e7a7c30f5e74f6aa0375b21a4522ec81756 (diff) | |
| download | podman-ca5bebb0825a738ee04c073646696906db95c97c.tar.gz podman-ca5bebb0825a738ee04c073646696906db95c97c.tar.bz2 podman-ca5bebb0825a738ee04c073646696906db95c97c.zip | |
Merge pull request #14501 from cdoern/podUTS
podman pod create --uts support
Diffstat (limited to 'pkg/specgen/generate/namespaces.go')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index 4224d16ce..a3719d58e 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -176,7 +176,14 @@ func namespaceOptions(s *specgen.SpecGenerator, rt *libpod.Runtime, pod *libpod. if pod == nil || infraCtr == nil { return nil, errNoInfra } - toReturn = append(toReturn, libpod.WithUTSNSFrom(infraCtr)) + if pod.NamespaceMode(spec.UTSNamespace) == host { + // adding infra as a nsCtr is not what we want to do when uts == host + // this leads the new ctr to try to add an ns path which is should not in this mode + logrus.Debug("pod has host uts, not adding infra as a nsCtr") + s.UtsNS = specgen.Namespace{NSMode: specgen.Host} + } else { + toReturn = append(toReturn, libpod.WithUTSNSFrom(infraCtr)) + } case specgen.FromContainer: utsCtr, err := rt.LookupContainer(s.UtsNS.Value) if err != nil { |