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.

5 files changed, 10 insertions, 10 deletions

diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index c83201a8..74e5a8a4 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -35,12 +35,12 @@ syntax:expression: exec " \
 delete:expression: "touch /tmp/static.$PPID"
 
 end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) $VAR(@)\" ; \
+         vyatta-vtysh -c \"configure terminal\" -c \"no ip route $VAR(../@) $VAR(@)\" ; \
          rm /tmp/static.$PPID; \
       else \
          if [ -n \"$VAR(./distance/@)\" ]; then \
 	    DIST=\"$VAR(./distance/@)\"; \
          fi; \	       
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"ip route $VAR(../@) $VAR(@) $DIST \" ; \
+         vyatta-vtysh -c \"configure terminal\" -c \"ip route $VAR(../@) $VAR(@) $DIST \" ; \
       fi; "
 
diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
index 1ad9ab2f..981201b3 100644
--- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
@@ -35,13 +35,13 @@ syntax:expression: exec " \
 delete: 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(../@) $VAR(@)";
         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(../@) $VAR(@) $DIST";
      fi;
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index aaeab5b6..930ecfa3 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -1,11 +1,11 @@
 help: Set to silently discard pkts when matched
 delete:expression: "touch /tmp/static.$PPID"
 end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
+         vyatta-vtysh -c \"configure terminal\" -c \"no ip 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\" -c \"ip route $VAR(../@) null0 $DIST \" ; \
+         vyatta-vtysh -c \"configure terminal\" -c \"ip route $VAR(../@) null0 $DIST \" ; \
       fi; "
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;