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/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
index 92493e34..ac9076ab 100644
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ b/templates/protocols/rip/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute BGP routes
 delete:expression: "touch /tmp/rip-redist-bgp.$PPID" 
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute bgp \"; \
       if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \
         rm -rf /tmp/rip-redist-bgp.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c
         if [ -n \"$VAR(./route-map/@)\" ]; then \
           COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute bgp $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
index 0374875a..1ad349ac 100644
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ b/templates/protocols/rip/redistribute/connected/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute connected routes
 delete:expression: "touch /tmp/rip-redist-connected.$PPID" 
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute connected \"; \
       if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \
         rm -rf /tmp/rip-redist-connected.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c
         if [ -n \"$VAR(./route-map/@)\" ]; then \
           COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute connected $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
index 82e39688..689dcfe5 100644
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ b/templates/protocols/rip/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute kernel routes
 delete:expression: "touch /tmp/rip-redist-kernel.$PPID" 
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute kernel \"; \
       if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \
         rm -rf /tmp/rip-redist-kernel.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c
         if [ -n \"$VAR(./route-map/@)\" ]; then \
           COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute kernel $COND\"; \
       fi; "
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
index 9fc3a646..bad996cb 100644
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ b/templates/protocols/rip/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute OSPF routes
 delete:expression: "touch /tmp/rip-redist-ospf.$PPID" 
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute ospf \"; \
       if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \
         rm -rf /tmp/rip-redist-ospf.$PPID; \
@@ -11,7 +11,7 @@ end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c
         if [ -n \"$VAR(./route-map/@)\" ]; then \
           COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute ospf $COND\"; \
       fi; "
 
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
index 7c20d4c0..384f3735 100644
--- a/templates/protocols/rip/redistribute/static/node.def
+++ b/templates/protocols/rip/redistribute/static/node.def
@@ -1,6 +1,6 @@
 help: Set to redistribute static routes
 delete:expression: "touch /tmp/rip-redist-static.$PPID" 
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
         -c \"no redistribute static \"; \
       if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \
         rm -rf /tmp/rip-redist-static.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c
         if [ -n \"$VAR(./route-map/@)\" ]; then \
           COND=\"$COND route-map $VAR(./route-map/@)\"; \
         fi; \
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
+        vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"redistribute static $COND\"; \
       fi; "