Revert "Replace vyatta-vtysh with vtysh"

This reverts commit 588492cf8a9ddf438b649c6db4986bcab9c22435.

15 files changed, 30 insertions, 30 deletions

diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 74fad33a..cfb7842b 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/loopback/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                            \
-         vtysh -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                                                               \
-         vtysh -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/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
index f4626dc8..85a66781 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
 help: Set MD5 key id
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip ospf authentication \"              \
        -c \"ip ospf authentication message-digest\"; "
 
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 0eb331e1..e97a3ec8 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec "                              \
           exit 1 ;                                     \
         fi ; "
 
-update:expression: "vtysh \
+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: "vtysh \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal\"                      \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip ospf authentication \"              \
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
index 9ae02bd0..3c256074 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: Set interface cost
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
         -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
         -c \"no ip ospf cost \"; "
 comp_help: <1-65535> Cost
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
index cf5640f8..4bff0b1f 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
@@ -1,9 +1,9 @@
 type: u32
 help: Set interval after which a neighbor is declared dead
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf dead-interval \"; "
 comp_help: <1-65535> Seconds
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
index bdfd7587..6e743064 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: Set interval between hello packets
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
           -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
           -c \"no ip ospf hello-interval \"; "
 comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
index 5a2b0c5b..ae2f1153 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,5 +1,5 @@
 help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf mtu-ignore\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
index 5ecbd1c5..c7fcc7e7 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
@@ -5,11 +5,11 @@ syntax:expression: $VAR(@) in "non-broadcast"; \
 
 allowed:echo non-broadcast
 
-update:expression: "vtysh              \
+update:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf network $VAR(@) \"; "
 
-delete:expression: "vtysh              \
+delete:expression: "vyatta-vtysh              \
        -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf network \"; "
 
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
index c419460e..c19b3f85 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: Set router priority
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf priority \"; "
 comp_help: <0-255> Priority
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
index d3615938..5dac04e1 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: Set interval between retransmitting lost link state advertisements
 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf retransmit-interval \"; "
 comp_help: <3-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
index 4835e25f..b60ed78f 100644
--- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,8 +1,8 @@
 type: u32
 help: Set link state transmit delay
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
           -c \"no ip ospf transmit-delay \"; "
 comp_help: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index 09a7121d..bcebd5ab 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec "                              \
           exit 1 ;                                     \
         fi ; "
 
-update:expression: "vtysh                    \
+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: "vtysh --noerror                \
+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/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def
index 268e0718..cdc9e54b 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/loopback/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: vtysh                            \
+update: vyatta-vtysh                            \
           -c "configure terminal" -c "interface $VAR(../../../../@)" \
           -c "ip rip authentication mode text"                       \
           -c "ip rip authentication string $VAR(@)"
 
-delete: vtysh                            \
+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/loopback/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def
index 1add501a..4989b867 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
 help: Disable split horizon on specified interface
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"no ip rip split-horizon \" "
 
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
        -c \"configure terminal \"                     \
        -c \"interface $VAR(../../../../@) \"          \
        -c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index b59ec376..17438eac 100644
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,8 +1,8 @@
 help: Enable split-horizon with poison reverse
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
           -c \"interface $VAR(../../../../@)\" \
           -c \"ip rip split-horizon poisoned-reverse\" "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
           -c \"interface $VAR(../../../../@)\" \
           -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" "