From 18a4c14670d734708417ad927926483cc0a3f14a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 2 Jul 2015 11:51:22 +0100 Subject: [PATCH] clarify network/address route overlap error/warning message Closes #1034. --- net/route.go | 4 ++-- weave | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/route.go b/net/route.go index 80df987a..6d1722ad 100644 --- a/net/route.go +++ b/net/route.go @@ -16,7 +16,7 @@ func CheckNetworkFree(subnet *net.IPNet) error { } for _, route := range routes { if route.Dst != nil && overlaps(route.Dst, subnet) { - return fmt.Errorf("Network %s overlaps with existing route %s", subnet, route.Dst) + return fmt.Errorf("Network %s overlaps with existing route %s on host.", subnet, route.Dst) } } return nil @@ -36,7 +36,7 @@ func CheckAddressOverlap(addr net.IP) error { } for _, route := range routes { if route.Dst != nil && route.Dst.Contains(addr) { - return fmt.Errorf("Address %s overlaps with existing route %s", addr, route.Dst) + return fmt.Errorf("Address %s overlaps with existing route %s on host.", addr, route.Dst) } } return nil diff --git a/weave b/weave index 5bc53f69..54b8fc50 100755 --- a/weave +++ b/weave @@ -988,7 +988,7 @@ launch_router() { if [ -z "$IPRANGE_SPECIFIED" ] ; then IPRANGE="10.128.0.0/10" if command_exists netcheck && ! netcheck $IPRANGE ; then - echo "Default -iprange $IPRANGE overlaps with existing route." >&2 + echo "Default -iprange $IPRANGE overlaps with existing route on host." >&2 echo "Please pick another range and set it on all hosts." >&2 exit 1 fi