summaryrefslogtreecommitdiff
path: root/templates/protocols
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-30 15:21:09 +0200
committerChristian Poessinger <christian@poessinger.com>2020-03-30 15:27:09 +0200
commitd40fe04ccde0993975ecdb6f560588042b96067e (patch)
tree557f2c8e0d5b81cb8d4f6bb5ec944c9161dbecaf /templates/protocols
parentc42197603dcd2498ae583f625c805355d41868ae (diff)
downloadvyatta-cfg-quagga-d40fe04ccde0993975ecdb6f560588042b96067e.tar.gz
vyatta-cfg-quagga-d40fe04ccde0993975ecdb6f560588042b96067e.zip
vrf: T2170: bugfix deleting leaked-routes
Diffstat (limited to 'templates/protocols')
-rw-r--r--templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def13
1 files changed, 7 insertions, 6 deletions
diff --git a/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def b/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def
index f7c63d70..61ee4854 100644
--- a/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def
@@ -13,13 +13,14 @@ end:
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
"$VAR(../@)" "$VAR(@)"
then
- quagga_conf=`vtysh -c "show running-config" | \
- sed -n '/vrf $VRF_NAME/,/!/p' | \
- grep "^ipv6 route $VAR(../@) $VAR(@)"`
- ifname=`echo $quagga_conf | awk '{print $5}'`
+ quagga_conf=$(vtysh -c "show running-config" | \
+ sed -n "/vrf ${VRF_NAME}/,/!/p" | \
+ grep "^ ipv6 route $VAR(../@) $VAR(@)")
+
+ vtysh -c "configure terminal" \
+ -c "vrf ${VRF_NAME}" \
+ -c "no ${quagga_conf}"
- vtysh -c "configure terminal" \
- -c "no ipv6 route $VAR(../@) $VAR(@) $ifname vrf $VRF_NAME"
fi
else
if [[ -n "$VAR(./distance/@)" ]]; then