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.

22 files changed, 48 insertions, 48 deletions

diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def
index 4245257a..edd739b8 100644
--- a/templates/protocols/ripng/aggregate-address/node.def
+++ b/templates/protocols/ripng/aggregate-address/node.def
@@ -4,10 +4,10 @@ help: Set aggregate RIPng route announcement
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "aggregate-address $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no aggregate-address $VAR(@)"
diff --git a/templates/protocols/ripng/default-information/originate/node.def b/templates/protocols/ripng/default-information/originate/node.def
index 359a7d31..9fb65c68 100644
--- a/templates/protocols/ripng/default-information/originate/node.def
+++ b/templates/protocols/ripng/default-information/originate/node.def
@@ -1,10 +1,10 @@
 help: Set to distribute a default route
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "default-information originate"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no default-information originate" "
 
diff --git a/templates/protocols/ripng/default-metric/node.def b/templates/protocols/ripng/default-metric/node.def
index 85463d28..6af8bc3b 100644
--- a/templates/protocols/ripng/default-metric/node.def
+++ b/templates/protocols/ripng/default-metric/node.def
@@ -2,11 +2,11 @@ type: u32
 help: Set metric of redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "default-metric $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no default-metric $VAR(@)"
 
diff --git a/templates/protocols/ripng/distribute-list/access-list/in/node.def b/templates/protocols/ripng/distribute-list/access-list/in/node.def
index ea05f150..b67087bc 100644
--- a/templates/protocols/ripng/distribute-list/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/in/node.def
@@ -3,11 +3,11 @@ help: Set access-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) in"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) in"
                      
diff --git a/templates/protocols/ripng/distribute-list/access-list/out/node.def b/templates/protocols/ripng/distribute-list/access-list/out/node.def
index f11f5c03..9345b4b8 100644
--- a/templates/protocols/ripng/distribute-list/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
-          -c "router ripng"                                       \
+update: vyatta-vtysh -c "configure terminal" \
+          -c "router ripng"                  \
           -c "distribute-list $VAR(@) out"
 
-delete: $vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
-          -c "router ripng"                                      \
+delete: vyatta-vtysh -c "configure terminal" \
+          -c "router ripng"                  \
           -c "no distribute-list $VAR(@) out"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
index 29d91a78..2297140c 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) in $VAR(../../@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
index 19805001..f6d3d1cc 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list $VAR(@) out $VAR(../../@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
index 93ba4f1c..3f29e1b3 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) in $VAR(../../@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
index b3585ecb..1173fc2f 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) out $VAR(../../@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
index 4b169517..dd73f83c 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) in"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) in"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
index 831880c3..7d13bedb 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
 
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "distribute-list prefix $VAR(@) out"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no distribute-list prefix $VAR(@) out"
diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def
index f62343a0..e45f069c 100644
--- a/templates/protocols/ripng/interface/node.def
+++ b/templates/protocols/ripng/interface/node.def
@@ -8,11 +8,11 @@ syntax:expression: exec " \
           exit 1 ; \
         fi ; "
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                         \
 	  -c "network $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                         \
           -c "no network $VAR(@)" "
 
diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def
index 0df3d570..2bbab1be 100644
--- a/templates/protocols/ripng/network/node.def
+++ b/templates/protocols/ripng/network/node.def
@@ -4,10 +4,10 @@ help: Set RIPng network
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "network $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no network $VAR(@)"
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index 550a5ac7..77991f97 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,7 +1,7 @@
 help: Configure Routing Information Protocol (RIPng) parameters
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "no router ripng"
diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def
index 403430b3..9654a1d3 100644
--- a/templates/protocols/ripng/passive-interface/node.def
+++ b/templates/protocols/ripng/passive-interface/node.def
@@ -9,20 +9,20 @@ syntax:expression: exec " \
      fi ; "
 
 update: if [ x$VAR(x) == xdefault ]; then
-           ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "passive-interface default";
         else
-           ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "passive-interface $VAR(@)";
         fi;
 delete: if [ x$VAR(x) == xdefault ]; then
-           ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "no passive-interface default"
         else
-           ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ripng"                                       \
              -c "no passive-interface $VAR(@)"; 
         fi;
diff --git a/templates/protocols/ripng/redistribute/bgp/node.def b/templates/protocols/ripng/redistribute/bgp/node.def
index a712b69b..92d01db4 100644
--- a/templates/protocols/ripng/redistribute/bgp/node.def
+++ b/templates/protocols/ripng/redistribute/bgp/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute BGP routes
 
 delete: touch /tmp/rip-redist-bgp.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute bgp"
      if [ -f "/tmp/rip-redist-bgp.$PPID" ]; then
@@ -14,7 +14,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute bgp $COND";
      fi
diff --git a/templates/protocols/ripng/redistribute/connected/node.def b/templates/protocols/ripng/redistribute/connected/node.def
index a0a64fd2..b2c82096 100644
--- a/templates/protocols/ripng/redistribute/connected/node.def
+++ b/templates/protocols/ripng/redistribute/connected/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute connected routes
 
 delete: touch /tmp/rip-redist-connected.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute connected"
      if [ -f "/tmp/rip-redist-connected.$PPID" ]; then
@@ -14,7 +14,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute connected $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/kernel/node.def b/templates/protocols/ripng/redistribute/kernel/node.def
index 6b233f87..3023733a 100644
--- a/templates/protocols/ripng/redistribute/kernel/node.def
+++ b/templates/protocols/ripng/redistribute/kernel/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute kernel routes
 
 delete: touch /tmp/rip-redist-kernel.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute kernel";
      if [ -f "/tmp/rip-redist-kernel.$PPID" ]; then
@@ -14,7 +14,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute kernel $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/ospfv3/node.def b/templates/protocols/ripng/redistribute/ospfv3/node.def
index 31e23803..cf4e37ae 100644
--- a/templates/protocols/ripng/redistribute/ospfv3/node.def
+++ b/templates/protocols/ripng/redistribute/ospfv3/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes
 
 delete: touch /tmp/rip-redist-ospf6.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute ospf6";
      if [ -f "/tmp/rip-redist-ospf6.$PPID" ]; then
@@ -14,7 +14,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "redistribute ospf6 $COND";
      fi;
diff --git a/templates/protocols/ripng/redistribute/static/node.def b/templates/protocols/ripng/redistribute/static/node.def
index 26f9fa09..2d142f2b 100644
--- a/templates/protocols/ripng/redistribute/static/node.def
+++ b/templates/protocols/ripng/redistribute/static/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute static routes
 
 delete: touch /tmp/rip-redist-static.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no redistribute static";
      if [ -f "/tmp/rip-redist-static.$PPID" ]; then
@@ -14,7 +14,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
         if [ -n "$VAR(./route-map/@)" ]; then
           COND="$COND route-map $VAR(./route-map/@)";
         fi;
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                         \
           -c "redistribute static $COND";
      fi;
diff --git a/templates/protocols/ripng/route/node.def b/templates/protocols/ripng/route/node.def
index bb35078f..bed064e4 100644
--- a/templates/protocols/ripng/route/node.def
+++ b/templates/protocols/ripng/route/node.def
@@ -4,11 +4,11 @@ help: Set RIPng static route
 
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 
-create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "route $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "no route $VAR(@)"
 
diff --git a/templates/protocols/ripng/timers/node.def b/templates/protocols/ripng/timers/node.def
index 16f04ff4..a0117092 100644
--- a/templates/protocols/ripng/timers/node.def
+++ b/templates/protocols/ripng/timers/node.def
@@ -2,13 +2,13 @@ help: Set RIPng timer values
 
 delete: touch /tmp/ripng-timers.$PPID
 
-end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
        -c "router ripng"                                       \
        -c "no timers basic";                                   \
      if [ -f "/tmp/ripng-timers.$PPID" ]; then
         rm -rf /tmp/ripng-timers.$PPID;
      else
-        ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ripng"                                       \
           -c "timers basic $VAR(./update/@)                       \
                            $VAR(./timeout/@)                      \