From 83208a531d1824ea7b0a55f9419e915e446c780a Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Wed, 3 Jun 2015 17:31:22 -0700 Subject: [PATCH] Using container NetworkDisabled to fix #13725 container.config.NetworkDisabled is set for both daemon's DisableNetwork and --networking=false case. Hence using this flag instead to fix #13725. There is an existing integration-test to catch this issue, but it is working for the wrong reasons. Signed-off-by: Madhu Venugopal --- daemon/container_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/container_linux.go b/daemon/container_linux.go index 6f1aa3ef01..4d93a9fb6b 100644 --- a/daemon/container_linux.go +++ b/daemon/container_linux.go @@ -183,7 +183,7 @@ func getDevicesFromPath(deviceMapping runconfig.DeviceMapping) (devs []*configs. func populateCommand(c *Container, env []string) error { var en *execdriver.Network - if !c.daemon.config.DisableNetwork { + if !c.Config.NetworkDisabled { en = &execdriver.Network{ NamespacePath: c.NetworkSettings.SandboxKey, }