From ec786d590f2ca9cb48e0992b9118f29c39b71683 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 22 Nov 2010 16:39:16 -0800
Subject: Bonding should have same VRRP rules as Ethernet

---
 templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def      | 4 +---
 templates/interfaces/bonding/node.tag/vrrp/node.def                   | 4 +---
 templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def        | 2 +-
 .../bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def       | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def
index 47aceb53..6abc6f89 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/vrrp/node.def
@@ -1,5 +1,3 @@
-help: Configure Virtual Router Redundancy Protocol (VRRP) parameters
-
+help: Virtual Router Redundancy Protocol (VRRP) parameters
 priority: 800
-
 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../../@).$VAR(../@) "
diff --git a/templates/interfaces/bonding/node.tag/vrrp/node.def b/templates/interfaces/bonding/node.tag/vrrp/node.def
index adeb0564..a9224ed9 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/node.def
@@ -1,5 +1,3 @@
-help: Configure Virtual Router Redundancy Protocol (VRRP)
-
+help: Virtual Router Redundancy Protocol (VRRP)
 priority: 800
-
 end:expression: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $VAR(../@) "
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
index 9c6a8b17..0458fd0d 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.def
@@ -1,7 +1,7 @@
 tag:
 type: u32
 help: VRRP group number
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
+syntax:expression: $VAR(@) > 0 && $VAR(@) <= 255; "VRRP group must be between 1-255"
 val_help: u32:1-255; VRRP group number
 
 commit:expression: $VAR(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $VAR(@)"
diff --git a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
index 920c59d1..88684dd8 100644
--- a/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vrrp/vrrp-group/node.tag/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
-syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "priority must be between 1-255"
+syntax:expression: $VAR(@) > 0 &&$VAR(@) <= 255; "priority must be between 1-255"
 help: Priority
 val_help: u32:1-255; Priority
-- 
cgit v1.2.3


From 1905a4cefe161e83b1c35558d2354a6c9f987e3d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 22 Nov 2010 16:41:10 -0800
Subject: typo in tunnel cleanup

---
 scripts/vyatta-tunnel-cleanup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup
index fdca80a3..41b34922 100644
--- a/scripts/vyatta-tunnel-cleanup
+++ b/scripts/vyatta-tunnel-cleanup
@@ -4,7 +4,7 @@
 # the underlying tunnel link, if all tunnels of that type are gone.
 
 # Create map of encapsulations still in use
-my $confg = new Vyatta::Config;
+my $config = new Vyatta::Config;
 $config->setLevel("interfaces tunnel");
 my %tunnel;
 foreach my $tun ($config->listNodes()) {
-- 
cgit v1.2.3