summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2011-03-10 10:53:00 -0800
committerMichael Larson <mike@vyatta.com>2011-03-10 10:53:00 -0800
commit998c329448bc0d71a68b3b8355ab003db5c01be0 (patch)
treed6a5af882c756cfbc833374ef1672ceaef8518b0 /scripts
parent3eefee211de792bd5a6012059803a755c5ebf943 (diff)
downloadvyatta-cfg-quagga-998c329448bc0d71a68b3b8355ab003db5c01be0.tar.gz
vyatta-cfg-quagga-998c329448bc0d71a68b3b8355ab003db5c01be0.zip
fix for bug 6081. Warning, but allow commit to proceed if duplicate address is found.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-interfaces.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index 94a822e0..0848b5c0 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -294,7 +294,8 @@ sub is_valid_addr_commit {
if ($addr eq 'dhcp') {
$dhcp = 1;
} elsif ($ipaddr_hash{$addr} && !is_ip_configured($ifname, $addr)) {
- die "Error: duplicate address [$addr]\n";
+ my $h = Vyatta::Misc::get_ipnet_intf_hash();
+ print "Warning: possible duplicate address $addr on $h->{$addr}\n";
} elsif ( is_ipv4($addr) ) {
$static_v4 = 1;
}