From 7bdfd1493721bc75f55fa72b200a7b037bffbbf3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 15 Mar 2010 10:10:03 -0700 Subject: Fix trailing whitespace errors Template errors caused by trailing whitespace. --- .../neighbor/node.tag/route-reflector-client/node.def | 18 +++++++++--------- .../neighbor/node.tag/route-server-client/node.def | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def index 1ea47938..167d7718 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def @@ -6,13 +6,13 @@ commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neig commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "protocols bgp $VAR(../../@) neighbor $VAR(../@) route-reflector-client: remote-as must equal local-as" -update: if [ -n "$VAR(../remote-as/@)" ]; then - peer="remote-as $VAR(../remote-as/@)"; - else - peer="peer-group $VAR(../peer-group/@)"; - fi; +update: if [ -n "$VAR(../remote-as/@)" ]; then + peer="remote-as $VAR(../remote-as/@)"; + else + peer="peer-group $VAR(../peer-group/@)"; + fi; - if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ @@ -26,16 +26,16 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then -c "neighbor $VAR(../@) route-reflector-client" fi -delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); +delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then vtysh --noerror \ - -c "configure terminal" \ + -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "address-family ipv6" \ -c "no neighbor $VAR(../@) route-reflector-client" else vtysh --noerror \ - -c "configure terminal" \ + -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ -c "no neighbor $VAR(../@) route-reflector-client" fi diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def index 913fe3b1..a82b7247 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def @@ -4,13 +4,13 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../ commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set route-server-client for a neighbor in a peer-group" -update: if [ -n "$VAR(../remote-as/@)" ]; then - peer="remote-as $VAR(../remote-as/@)"; - else - peer="peer-group $VAR(../peer-group/@)"; - fi; +update: if [ -n "$VAR(../remote-as/@)" ]; then + peer="remote-as $VAR(../remote-as/@)"; + else + peer="peer-group $VAR(../peer-group/@)"; + fi; - if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); + if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then vtysh -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ @@ -24,12 +24,12 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then -c "neighbor $VAR(../@) route-server-client" fi -delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); +delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@); then vtysh --noerror \ -c "configure terminal" \ -c "router bgp $VAR(../../@)" \ - -c "address-family ipv6" \ + -c "address-family ipv6" \ -c "no neighbor $VAR(../@) route-server-client" else vtysh --noerror \ -- cgit v1.2.3 From 0e00599791bab7907aff3178b8fdcd72ff4dbc5b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 15 Mar 2010 10:11:04 -0700 Subject: 0.18.65 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7f35c2c6..2b5485d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-quagga (0.18.65) unstable; urgency=low + + * Fix trailing whitespace errors + + -- Stephen Hemminger Mon, 15 Mar 2010 10:11:03 -0700 + vyatta-cfg-quagga (0.18.64) unstable; urgency=low * Force dependency on more recent quagga -- cgit v1.2.3 From be4c5b90796a8c700d4b4f4133302e776374d5a5 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 17 Mar 2010 10:53:25 -0700 Subject: Bugfix 5458: Include interface name, if present, when deleting IPv6 routes. When deleting an IPv6 static route from Quagga, we have to specify the route precisely the same way it was originally configured. If the route includes an outgoing interface, it must be specified. If the route does not include an outgoing interface, one must not be specified. --- templates/protocols/static/route6/node.tag/next-hop/node.def | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def index 4d123637..31e75a92 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.def @@ -1,6 +1,9 @@ tag: + type: ipv6 + help: Set the next-hop IPv6 router [REQUIRED] + end: if [[ -z "$VAR(./disable)" ]] then @@ -9,8 +12,12 @@ end: if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ "$VAR(../@)" "$VAR(@)" then + quagga_conf=`vtysh -c "show running-config" | \ + grep "^ipv6 route $VAR(../@) $VAR(@)"` + ifname=`echo $quagga_conf | awk '{print $5}'` + vtysh -c "configure terminal" \ - -c "no ipv6 route $VAR(../@) $VAR(@)" + -c "no ipv6 route $VAR(../@) $VAR(@) $ifname" fi else if [[ -n "$VAR(./distance/@)" ]] -- cgit v1.2.3 From 641f6e6f458a7e93a62ca3db1504325f6caa687a Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 17 Mar 2010 11:00:43 -0700 Subject: 0.18.66 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2b5485d2..12257012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-quagga (0.18.66) unstable; urgency=low + + * Bugfix 5458: Include interface name, if present, when deleting IPv6 + routes. + + -- Bob Gilligan Wed, 17 Mar 2010 11:00:43 -0700 + vyatta-cfg-quagga (0.18.65) unstable; urgency=low * Fix trailing whitespace errors -- cgit v1.2.3