diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-22 18:35:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 18:35:48 -0400 |
| commit | c58a677f8edc36c32728a87a6ac2c48d244d7ea2 (patch) | |
| tree | 9036af20111c5dfff60cf92dc930f5e528df8a2d /libpod/container_internal_linux.go | |
| parent | 20587dfb7d26781aaa31b11c984f7dec8e79a282 (diff) | |
| parent | 8ee18bde152da71f1b7ba9d7575324321be630d6 (diff) | |
| download | podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.tar.gz podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.tar.bz2 podman-c58a677f8edc36c32728a87a6ac2c48d244d7ea2.zip | |
Merge pull request #11705 from mheon/340
Release 3.4.0-rc2 (inc. backports)
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 4194a0d93..89287efc9 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -2001,15 +2001,16 @@ func (c *Container) getHosts() string { // Do we have a network namespace? netNone := false - for _, ns := range c.config.Spec.Linux.Namespaces { - if ns.Type == spec.NetworkNamespace { - if ns.Path == "" && !c.config.CreateNetNS { - netNone = true + if c.config.NetNsCtr == "" && !c.config.CreateNetNS { + for _, ns := range c.config.Spec.Linux.Namespaces { + if ns.Type == spec.NetworkNamespace { + if ns.Path == "" { + netNone = true + } + break } - break } } - // If we are net=none (have a network namespace, but not connected to // anything) add the container's name and hostname to localhost. if netNone { |