Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-cfg-system into oxnard

2 files changed, 12 insertions, 2 deletions

diff --git a/scripts/install/install-image b/scripts/install/install-image
index ea8cfd7f..b5061b26 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -62,9 +62,9 @@ fetch_iso_by_url ()
 	auth=""
     fi
 
-    client_hdr="-H vyatta-client: install-image"
+    client_hdr="-HVyatta-Client: install-image"
     vyatta_version=`dpkg-query --showformat='${Version}' --show vyatta-version`
-    vers_hdr="-H vyatta-version: $vyatta_version"
+    vers_hdr="-HVyatta-Version: $vyatta_version"
 
     filename="${TEMP_DIR}/${NEW_ISO##*/}"
     curl "$client_hdr" "$vers_hdr" $auth -f -o $filename $NEW_ISO
diff --git a/scripts/keepalived/vyatta-show-vrrp.pl b/scripts/keepalived/vyatta-show-vrrp.pl
index 818d5e40..ecf2bf75 100755
--- a/scripts/keepalived/vyatta-show-vrrp.pl
+++ b/scripts/keepalived/vyatta-show-vrrp.pl
@@ -301,6 +301,16 @@ if ($showsummary == 1) {
 }
 
 foreach my $intf (@intfs) {
+    my $intf_vrid;
+    if ($intf =~ m/(\w+)\.(\d+)v(\d+)/){
+       $intf = "$1.$2";
+       $intf_vrid = $3; 
+    } elsif ($intf =~ m/(\w+)v(\d+)/){
+       $intf = $1;
+       $intf_vrid = $2; 
+    }
+    next if ($group ne 'all' && $intf_vrid && $intf_vrid != $group);
+    $group = $intf_vrid if ($group eq 'all' && $intf_vrid);
     my @state_files = Vyatta::Keepalived::get_state_files($intf, $group);
     foreach my $state_file (@state_files) {
 	&$display_func($state_file);