|
@@ -253,9 +253,9 @@ func setupIPTables(addr net.Addr, icc, ipmasq bool) error {
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
-// configureBridge attempts to create and configure a network bridge interface named `ifaceName` on the host
|
|
|
|
|
|
+// configureBridge attempts to create and configure a network bridge interface named `bridgeIface` on the host
|
|
// If bridgeIP is empty, it will try to find a non-conflicting IP from the Docker-specified private ranges
|
|
// If bridgeIP is empty, it will try to find a non-conflicting IP from the Docker-specified private ranges
|
|
-// If the bridge `ifaceName` already exists, it will only perform the IP address association with the existing
|
|
|
|
|
|
+// If the bridge `bridgeIface` already exists, it will only perform the IP address association with the existing
|
|
// bridge (fixes issue #8444)
|
|
// bridge (fixes issue #8444)
|
|
// If an address which doesn't conflict with existing interfaces can't be found, an error is returned.
|
|
// If an address which doesn't conflict with existing interfaces can't be found, an error is returned.
|
|
func configureBridge(bridgeIP string) error {
|
|
func configureBridge(bridgeIP string) error {
|