From c0bde4e92c1da26e206bfbcb8308bd9a5f037659 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Fri, 25 Dec 2015 02:09:37 -0500 Subject: [PATCH] Fix network disconnect does not save the config to disk Signed-off-by: Lei Jitang --- daemon/container_operations_unix.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index bdc80357ef..9f74b0fdb7 100644 --- a/daemon/container_operations_unix.go +++ b/daemon/container_operations_unix.go @@ -711,15 +711,17 @@ func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, n li return runconfig.ErrConflictHostNetwork } - return disconnectFromNetwork(container, n) -} - -func disconnectFromNetwork(container *container.Container, n libnetwork.Network) error { + if err := disconnectFromNetwork(container, n); err != nil { + return err + } if err := container.ToDiskLocking(); err != nil { return fmt.Errorf("Error saving container to disk: %v", err) } + return nil +} +func disconnectFromNetwork(container *container.Container, n libnetwork.Network) error { var ( ep libnetwork.Endpoint sbox libnetwork.Sandbox