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.

16 files changed, 32 insertions, 32 deletions

diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def
index c58b0a12..250f9429 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID"
 
 end:expression: "\
       if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                            \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"     \
+         vyatta-vtysh -c \"configure terminal\"     \
           -c \"interface $VAR(../../../../../@) \"                       \
           -c \"no ip ospf message-digest-key $VAR(@) \";                 \
          rm /tmp/ospf-md5.$PPID;                                         \
       else                                                               \
-         ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\"     \
+         vyatta-vtysh -c \"configure terminal\"     \
           -c \"interface $VAR(../../../../../@) \"                       \
           -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
       fi; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def
index 5e85d80e..2c96c430 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
 help: Set MD5 key id
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+update:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip ospf authentication \"              \
        -c \"ip ospf authentication message-digest \"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 5339e937..034bc793 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec "                              \
           exit 1 ;                                     \
         fi ; "
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl  \
+update:expression: "vyatta-vtysh  \
          -c \"configure terminal\"                     \
          -c \"interface $VAR(../../../../@) \"         \
 	 -c \"no ip ospf authentication \"             \
 	 -c \"ip ospf authentication \"                \
 	 -c \"ip ospf authentication-key $VAR(@) \"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl  \
+delete:expression: "vyatta-vtysh  \
          -c \"configure terminal\"                     \
          -c \"interface $VAR(../../../../@) \"         \
 	 -c \"no ip ospf authentication \"             \
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def
index 13c9791f..279af757 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def
@@ -2,12 +2,12 @@ type: u32
 help: Set bandwidth (kilobits/sec)
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
        "Must be between 1-10000000"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+update:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../@) \"             \
        -c \"bandwidth $VAR(@) \"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../@) \"             \
        -c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def
index 3dc62f2b..73282e21 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def
@@ -1,12 +1,12 @@
 type: u32
 help: Set interface cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+update:expression: "vyatta-vtysh \
        -c \"configure terminal\"                     \
        -c \"interface $VAR(../../../@)\"             \
        -c \"ip ospf cost $VAR(@) \"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../@)\"              \
        -c \"no ip ospf cost \"; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def
index dc1bf9db..625d8a04 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def
@@ -3,11 +3,11 @@ help: Set interval after which a neighbor is declared dead
 default: 40
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+update:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf dead-interval $VAR(@)\"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+delete:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf dead-interval \"; "
 
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def
index 435a82a6..885ccb43 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def
@@ -2,10 +2,10 @@ type: u32
 help: Set interval between hello packets
 default: 10
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl               \
+update:expression: "vyatta-vtysh               \
        -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
        -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl               \
+delete:expression: "vyatta-vtysh               \
        -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
        -c \"no ip ospf hello-interval \"; "
 comp_help: possible completions:
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def
index 7284924c..1bce2ca9 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
 help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+create:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../@)\"              \
        -c \"ip ospf mtu-ignore\"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../@)\"              \
        -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def
index 85854b38..347aee8a 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def
@@ -3,12 +3,12 @@ help: Set network type
 syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
        "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+update:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../@) \"             \
        -c \"ip ospf network $VAR(@) \"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../@) \"             \
        -c \"no ip ospf network \"; "
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def
index 8f276f74..15d48ad2 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def
@@ -3,11 +3,11 @@ help: Set router priority
 default: 1
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+update:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf priority $VAR(@)\"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+delete:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf priority \"; "
 
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def
index de9a7151..fb75fd82 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def
@@ -3,11 +3,11 @@ help: Set interval between retransmitting lost link state advertisements
 default: 5
 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+update:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf retransmit-interval $VAR(@)\"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+delete:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf retransmit-interval \"; "
 
diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def
index bb49108e..f8b80a10 100644
--- a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def
@@ -2,11 +2,11 @@ type: u32
 help: Set link state transmit delay
 default: 1
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+update:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf transmit-delay $VAR(@)\"; "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+delete:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf transmit-delay \"; "
 
diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index bc653d00..bcebd5ab 100644
--- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec "                              \
           exit 1 ;                                     \
         fi ; "
 
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl                    \
+update:expression: "vyatta-vtysh                    \
        -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
        -c \"ip rip authentication mode md5\"                             \
        -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
        -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \
        -c \"key-string $VAR(@)\" "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr                \
+delete:expression: "vyatta-vtysh --noerror                \
        -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\"    \
        -c \"no ip rip authentication mode md5\"                             \
        -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def
index aaaae83e..36a3926c 100644
--- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -8,12 +8,12 @@ syntax:expression: exec "                              \
 
 commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
 
-update: ${vyatta_sbindir}/vyatta-vtysh.pl                            \
+update: vyatta-vtysh                            \
           -c "configure terminal" -c "interface $VAR(../../../../@)" \
           -c "ip rip authentication mode text"                       \
           -c "ip rip authentication string $VAR(@)"
 
-delete: ${vyatta_sbindir}/vyatta-vtysh.pl                            \
+delete: vyatta-vtysh                            \
           -c "configure terminal" -c "interface $VAR(../../../../@)" \
           -c "no ip rip authentication mode"                         \
           -c "no ip rip authentication string $VAR(@)"
diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def
index 01740cf7..bc32f241 100644
--- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
 help: Disable split horizon on specified interface
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+create:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip rip split-horizon \" "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 60b45d60..fcd7a857 100644
--- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
 help: Enable split-horizon with poison reverse
-create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+create:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"ip rip split-horizon poisoned-reverse \" "
 
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip rip split-horizon \"                \