summaryrefslogtreecommitdiff
path: root/scripts/vyatta-interfaces.pl
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-12-06 11:08:47 -0800
committerStephen Hemminger <shemminger@vyatta.com>2011-12-06 11:08:47 -0800
commit2056a4e39f8d7de951aea856efd676f173f0f3a9 (patch)
tree5bb481c06ba0d9bd62aca48e2ee377b77731c1eb /scripts/vyatta-interfaces.pl
parent8426b9dcd6ddbe8c627b925e2d31f86a299ffa2f (diff)
parentfa84fe0e3b0f2fac340ac8e51148d47006a1880f (diff)
downloadvyatta-cfg-system-2056a4e39f8d7de951aea856efd676f173f0f3a9.tar.gz
vyatta-cfg-system-2056a4e39f8d7de951aea856efd676f173f0f3a9.zip
Merge branch 'oxnard' of fiji.vyatta.com:/git/vyatta-cfg-system into oxnard
Diffstat (limited to 'scripts/vyatta-interfaces.pl')
-rwxr-xr-xscripts/vyatta-interfaces.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index c4d04e7a..2b75dba5 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -400,8 +400,9 @@ sub show_interfaces {
next unless $intf; # skip unknown types
next if $skip_interface{$name};
next unless ($type eq 'all' || $type eq $intf->type());
-
- if ($vif_name) {
+ if ($intf->vrid()){
+ push @match, $name; # add all vrrp interfaces
+ } elsif ($vif_name) {
next unless $intf->vif();
push @match, $intf->vif()
if ($vif_name eq $intf->physicalDevice());