From bb626b99b59133577e333cd2b5553cdc621c4ad7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 30 Jul 2008 15:28:35 -0700
Subject: 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.
---
 templates/system/gateway-address/node.def | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'templates/system/gateway-address/node.def')

diff --git a/templates/system/gateway-address/node.def b/templates/system/gateway-address/node.def
index 87416e8c..3a42a45e 100644
--- a/templates/system/gateway-address/node.def
+++ b/templates/system/gateway-address/node.def
@@ -1,9 +1,9 @@
 type: ipv4
 help: Set default gateway
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route 0.0.0.0/0 $VAR(@)\" "
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"ip route 0.0.0.0/0 $VAR(@)\" "
 update:expression: "oldgw=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl '$(/system/gateway-address/@)' ` && \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"no ip route 0.0.0.0/0 $oldgw \" && \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route 0.0.0.0/0 $VAR(@)\" "
+        vyatta-vtysh --noerror -c \"configure terminal\" -c \"no ip route 0.0.0.0/0 $oldgw \" && \
+        vyatta-vtysh -c \"configure terminal\" -c \"ip route 0.0.0.0/0 $VAR(@)\" "
 delete:expression: "if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \"$VAR(@)\"; then \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route 0.0.0.0/0 $VAR(@)\"; fi"
+        vyatta-vtysh -c \"configure terminal\" -c \"no ip route 0.0.0.0/0 $VAR(@)\"; fi"
 
-- 
cgit v1.2.3

