docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

network: exclude default routes from checkRouteOverlaps 

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
This commit is contained in:
Johan Euphrosine 2014-01-17 11:05:08 -08:00
parent 26726dc9ff
commit a886fbfa4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network.go
View File

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