summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-06 18:31:36 +0000
committerChristian Poessinger <christian@poessinger.com>2020-03-06 18:31:36 +0000
commite60dcd0ba00f0c38f10c7f4e487f7be3e43d277a (patch)
treed1065c37d37ac5066c3b785e02a4f6c33b35a523
parente927cd2a3e98b4396626db0276c4caa3699d2c44 (diff)
downloadvyatta-cfg-quagga-e60dcd0ba00f0c38f10c7f4e487f7be3e43d277a.tar.gz
vyatta-cfg-quagga-e60dcd0ba00f0c38f10c7f4e487f7be3e43d277a.zip
ipv6: route6: tabs and spaces
-rw-r--r--templates/protocols/static/route6/node.tag/blackhole/node.def3
-rw-r--r--templates/protocols/static/route6/node.tag/next-hop/node.def7
2 files changed, 3 insertions, 7 deletions
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index 48fca8f8..87a259d1 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -1,6 +1,5 @@
help: Silently discard pkts when matched
-
-end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
+end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then
if ! ${vyatta_sbindir}/vyatta-next-hop-check $VAR(../@) ipv6 address; then
exit 1;
fi
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 e3a668b7..a63064d9 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -1,9 +1,6 @@
tag:
-
type: ipv6
-
help: Next-hop IPv6 router [REQUIRED]
-
end:
if [[ -z "$VAR(./disable)" ]]
then
@@ -15,9 +12,9 @@ end:
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
"$VAR(../@)" "$VAR(@)"
then
- quagga_conf=`vtysh -c "show running-config" | \
+ quagga_conf=`vtysh -c "show running-config" | \
grep "^ipv6 route $VAR(../@) $VAR(@)"`
- ifname=`echo $quagga_conf | awk '{print $5}'`
+ ifname=`echo $quagga_conf | awk '{print $5}'`
vtysh -c "configure terminal" \
-c "no ipv6 route $VAR(../@) $VAR(@) $ifname"