1 files changed, 18 insertions, 3 deletions
diff --git a/libpod/container.go b/libpod/container.go
index b6155a809..b5346e581 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -1001,13 +1001,28 @@ func (c *Container) IsReadOnly() bool {
 }
 
 // NetworkDisabled returns whether the container is running with a disabled network
-func (c *Container) NetworkDisabled() bool {
+func (c *Container) NetworkDisabled() (bool, error) {
+	if c.config.NetNsCtr != "" {
+		container, err := c.runtime.LookupContainer(c.config.NetNsCtr)
+		if err != nil {
+			return false, err
+		}
+		return networkDisabled(container)
+	}
+	return networkDisabled(c)
+
+}
+
+func networkDisabled(c *Container) (bool, error) {
+	if c.config.CreateNetNS {
+		return false, nil
+	}
 	if !c.config.PostConfigureNetNS {
 		for _, ns := range c.config.Spec.Linux.Namespaces {
 			if ns.Type == spec.NetworkNamespace {
-				return ns.Path == ""
+				return ns.Path == "", nil
 			}
 		}
 	}
-	return false
+	return false, nil
 }