summaryrefslogtreecommitdiff
path: root/templates/protocols/static/route6
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-30 15:28:35 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-07-30 15:28:35 -0700
commitbb626b99b59133577e333cd2b5553cdc621c4ad7 (patch)
tree6b4417b20f57b33c3dae8495d764417c6fa55832 /templates/protocols/static/route6
parent88bcee588c999abe4eae6fb12f01a8ca2d929279 (diff)
downloadvyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.tar.gz
vyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.zip
Replace calls to vyatta-vtysh perl script with vyatta-vtysh
No longer need the perl wrapper, the logging and error suppression are now in the command itself. This helps with the speed of route creation with lots of routes.
Diffstat (limited to 'templates/protocols/static/route6')
-rw-r--r--templates/protocols/static/route6/node.tag/blackhole/node.def4
-rw-r--r--templates/protocols/static/route6/node.tag/next-hop/node.def4
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index 9e14a628..bd8601d5 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -2,13 +2,13 @@ help: Set to silently discard pkts when matched
delete:expression: "touch /tmp/static.$PPID"
end: if [ -f "/tmp/static.$PPID" ]; then
- ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ipv6 route $VAR(../@) null0";
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ipv6 route $VAR(../@) null0 $DIST";
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 d62088ce..3f9cd440 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -4,12 +4,12 @@ help: Set the next-hop IPv6 router
delete: touch /tmp/static.$PPID
end: if [ -f "/tmp/static.$PPID" ]; then
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(../@)" "$VAR(@)"; then
- ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ;
+ vyatta-vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ;
fi;
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
+ vyatta-vtysh -c "configure terminal" -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
fi;