clarify network/address route overlap error/warning message

Closes #1034.
This commit is contained in:
Matthias Radestock committed 2015-07-02 11:51:22 +01:00
1 parent 0f67dbd8bd
commit 18a4c14670
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -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
+1 -1
View File
@@ -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