浏览代码

network: exclude default routes from checkRouteOverlaps

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Johan Euphrosine 11 年之前
父节点
当前提交
a886fbfa4a
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      network.go

+ 1 - 1
network.go

@@ -73,7 +73,7 @@ func networkSize(mask net.IPMask) int32 {
 
 func checkRouteOverlaps(networks []netlink.Route, dockerNetwork *net.IPNet) error {
 	for _, network := range networks {
-		if networkOverlaps(dockerNetwork, network.IPNet) {
+		if !network.Default && networkOverlaps(dockerNetwork, network.IPNet) {
 			return fmt.Errorf("Network %s is already routed: '%s'", dockerNetwork, network)
 		}
 	}