Selaa lähdekoodia

Fix network disconnect does not save the config to disk

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Lei Jitang 9 vuotta sitten
vanhempi
commit
c0bde4e92c
1 muutettua tiedostoa jossa 6 lisäystä ja 4 poistoa
  1. 6 4
      daemon/container_operations_unix.go

+ 6 - 4
daemon/container_operations_unix.go

@@ -711,15 +711,17 @@ func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, n li
 		return runconfig.ErrConflictHostNetwork
 		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 {
 	if err := container.ToDiskLocking(); err != nil {
 		return fmt.Errorf("Error saving container to disk: %v", err)
 		return fmt.Errorf("Error saving container to disk: %v", err)
 	}
 	}
+	return nil
+}
 
 
+func disconnectFromNetwork(container *container.Container, n libnetwork.Network) error {
 	var (
 	var (
 		ep   libnetwork.Endpoint
 		ep   libnetwork.Endpoint
 		sbox libnetwork.Sandbox
 		sbox libnetwork.Sandbox