Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth

3 files changed, 10 insertions, 2 deletions

diff --git a/scripts/keepalived/vyatta-keepalived.pl b/scripts/keepalived/vyatta-keepalived.pl
index e834745b..f419ac41 100755
--- a/scripts/keepalived/vyatta-keepalived.pl
+++ b/scripts/keepalived/vyatta-keepalived.pl
@@ -247,7 +247,9 @@ sub keepalived_get_values {
     $output .= "\tinterface $intf\n";
     $output .= "\tvirtual_router_id $group\n";
     if ($use_vmac) {
-	$output .= "\tuse_vmac\n";
+	$output .= "\tuse_vmac $intf";
+	$output .= "v";
+	$output .= "$group\n";
     }
     $output .= "\tpriority $priority\n";
     if ( $preempt eq "false" ) {
diff --git a/scripts/keepalived/vyatta-show-vrrp.pl b/scripts/keepalived/vyatta-show-vrrp.pl
index 28a9970c..68a98390 100755
--- a/scripts/keepalived/vyatta-show-vrrp.pl
+++ b/scripts/keepalived/vyatta-show-vrrp.pl
@@ -188,6 +188,7 @@ sub vrrp_showsummary {
     my ($interface_state, $link) = get_state_link($intf);
     if ($state eq "master" || $state eq "backup" || $state eq "fault") {
         my ($primary_addr, $priority, $preempt, $advert_int, $auth_type,
+	    $vmac_interface,
             @vips) = Vyatta::Keepalived::vrrp_get_config($intf, $group);
 	my $format = "\n%-16s%-8s%-8s%-16s%-16s%-16s";
 	my $vip = shift @vips;
@@ -210,9 +211,14 @@ sub vrrp_show {
     my $first_vip = '';
     if ($state eq "master" || $state eq "backup" || $state eq "fault") {
 	my ($primary_addr, $priority, $preempt, $advert_int, $auth_type, 
+	    $vmac_interface,
 	    @vips) = Vyatta::Keepalived::vrrp_get_config($intf, $group);
         my $sync = list_vrrp_sync_group($intf, $group);
 	print "Physical interface: $intf, Source Address $primary_addr\n";
+	if ($vmac_interface) {
+	    my $vma = "$intf" . "v" . "$group";
+	    print "  Virtual MAC interface: $vma\n";
+	}
 	print "  Interface state: $link, Group $group, State: $state\n";
 	print "  Priority: $priority, Advertisement interval: $advert_int, ";
 	print "Authentication type: $auth_type\n";
diff --git a/scripts/system/vyatta_update_ntp.pl b/scripts/system/vyatta_update_ntp.pl
index 3cb19804..4619b3bc 100755
--- a/scripts/system/vyatta_update_ntp.pl
+++ b/scripts/system/vyatta_update_ntp.pl
@@ -32,7 +32,7 @@ $cfg->setLevel("system ntp");
 
 foreach my $server ($cfg->listNodes("server")) {
     print "server $server iburst";
-    for my $property qw(dynamic noselect preempt prefer) {
+    for my $property (qw(dynamic noselect preempt prefer)) {
 	print " $property" if ($cfg->exists("$server $property"));
     }
     print "\n";