diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-06 12:50:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 12:50:18 -0800 |
| commit | d37647ddf80aca7b07294a5141ffb7fb94e17359 (patch) | |
| tree | ef0107963846ab60242e945e6f151542af1f37cb /libpod/container_internal.go | |
| parent | fb3ceeb385b11efa7952c87698add01bdff01c54 (diff) | |
| parent | 39a036e24d026b62e49ce7ba00de8bafd38cd953 (diff) | |
| download | podman-d37647ddf80aca7b07294a5141ffb7fb94e17359.tar.gz podman-d37647ddf80aca7b07294a5141ffb7fb94e17359.tar.bz2 podman-d37647ddf80aca7b07294a5141ffb7fb94e17359.zip | |
Merge pull request #1951 from baude/podcontainernet
bind mount /etc/resolv.conf|hosts in pods
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 934ad7a22..0148e3e7c 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -601,7 +601,11 @@ func (c *Container) checkDependenciesRunningLocked(depCtrs map[string]*Container } func (c *Container) completeNetworkSetup() error { - if !c.config.PostConfigureNetNS || c.NetworkDisabled() { + netDisabled, err := c.NetworkDisabled() + if err != nil { + return err + } + if !c.config.PostConfigureNetNS || netDisabled { return nil } if err := c.syncContainer(); err != nil { |