Revert "Replace vyatta-vtysh with vtysh"

This reverts commit 588492cf8a9ddf438b649c6db4986bcab9c22435.

19 files changed, 45 insertions, 45 deletions

diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
index 52d5c949..251c9c30 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
@@ -3,7 +3,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
 syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
 create:expression: "                                                            \
       if [ x$VAR(../../@) != x0.0.0.0 ] && [ x$VAR(../../@) != x0 ]; then       \
-         vtysh -c \"configure terminal\"            \
+         vyatta-vtysh -c \"configure terminal\"            \
            -c \"router ospf\"                                                   \
            -c \"no area $VAR(../../@) stub\" -c \"no area $VAR(../../@) nssa\"; \
       fi; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index ea03efdb..65cff07f 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -2,16 +2,16 @@ type: u32
 help: Set the summary-default cost of nssa area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
 
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) nssa"                         \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) default-cost $VAR(@)"; 
 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
index 14c9df74..6a4ad877 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
@@ -5,7 +5,7 @@ syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
 
 delete: touch /tmp/ospf-area-nssa.$PPID
 end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ospf" -c "no area $VAR(../../@) nssa";
 	rm /tmp/ospf-area-nssa.$PPID;
      else
@@ -22,6 +22,6 @@ end: if [ -f "/tmp/ospf-area-nssa.$PPID" ]; then
         if [ $? -eq 0 ] ; then
            PARM="$PARM no-summary";  
         fi;
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ospf" -c "area $VAR(../../@) nssa $PARM";
      fi;
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index 52b73d05..1929ef18 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -2,16 +2,16 @@ type: u32
 help: Set the summary-default cost of stub area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
 
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) stub"                         \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "area $VAR(../../../@) default-cost $VAR(@)";
 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
index 96facade..dfcbfdf7 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
@@ -1,7 +1,7 @@
 help: Set to not inject inter-area routes into stub
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../../@) stub no-summary \"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"no area $VAR(../../../@) stub no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
index 04d186fd..b9d2066c 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
@@ -2,9 +2,9 @@ help: Set stub OSPF area
 syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub"
 syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
 syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) stub\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) stub\"; " 
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 3c87b9db..2146df7f 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -5,20 +5,20 @@ syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
 
 update:expression: "\
         if [ x$VAR(@) == xplaintext-password ]; then               \
-           vtysh                       \
+           vyatta-vtysh                       \
             -c \"configure terminal\"                              \
             -c \"router ospf \"                                    \
             -c \"no area $VAR(../@) authentication \"              \
             -c \"area $VAR(../@) authentication \" ;               \
          else                                                      \
-           vtysh                       \
+           vyatta-vtysh                       \
             -c \"configure terminal\"                              \
             -c \"router ospf \"                                    \
             -c \"no area $VAR(../@) authentication \"              \
             -c \"area $VAR(../@) authentication message-digest\" ; \
          fi; "
 
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
             -c \"router ospf \"                                                 \
             -c \"no area $VAR(../@) authentication \" "
 
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index fa977c98..17648610 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -3,9 +3,9 @@ type: ipv4net
 help: Set OSPF network
 priority: 1
 syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"network $VAR(@) area $VAR(../@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no network $VAR(@) area $VAR(../@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 72004a5e..c2c74ecb 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
 delete: touch /tmp/ospf-range.$PPID
 
 end: if [ -f /tmp/ospf-range.$PPID ]; then
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../@) range $VAR(@)";
         rm /tmp/ospf-range.$PPID;
@@ -18,26 +18,26 @@ end: if [ -f /tmp/ospf-range.$PPID ]; then
               echo "Remove 'not-advertise' before setting cost or substitue";
 	      exit 1;
            fi;
-           vtysh --noerror -c "configure terminal" \
+           vyatta-vtysh --noerror -c "configure terminal" \
              -c "router ospf"                                               \
              -c "no area $VAR(../@) range $VAR(@)";
-           vtysh -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ospf"                                        \
              -c "area $VAR(../@) range $VAR(@) not-advertise";
         else
-           vtysh --noerror -c "configure terminal" \
+           vyatta-vtysh --noerror -c "configure terminal" \
              -c "router ospf"                                               \
              -c "no area $VAR(../@) range $VAR(@)";
-           vtysh -c "configure terminal" \
+           vyatta-vtysh -c "configure terminal" \
              -c "router ospf"                                        \
              -c "area $VAR(../@) range $VAR(@)";
            if [ -n "$VAR(cost/@)" ]; then
-              vtysh -c "configure terminal" \
+              vyatta-vtysh -c "configure terminal" \
                 -c "router ospf"                                        \
                 -c "area $VAR(../@) range $VAR(@) cost $VAR(cost/@)";
            fi;
            if [ -n "$VAR(substitute/@)" ]; then
-              vtysh -c "configure terminal" \
+              vyatta-vtysh -c "configure terminal" \
                 -c "router ospf"                                        \
                 -c "area $VAR(../@) range $VAR(@) substitute $VAR(substitute/@)";
            fi;
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
index 4728b0f3..e5387351 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
@@ -1,7 +1,7 @@
 help: Set to not advertise this range
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index 85b7df93..15046236 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,10 +1,10 @@
 type: txt
 help: Set area's shortcut mode
 syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"area $VAR(../@) shortcut $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"no area $VAR(../@) shortcut $VAR(@)\"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
index 4f8e71f0..614a50cd 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
@@ -2,9 +2,9 @@ tag:
 type: ipv4
 help: Set a virtual link
 syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)"
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../@) virtual-link $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../@) virtual-link $VAR(@)\"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index f906e58f..0806a5c7 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -6,13 +6,13 @@ commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@
 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 \"router ospf\"                                          \
            -c \"no area $VAR(../../../../@)                            \
            virtual-link $VAR(../../../@) message-digest-key $VAR(@)\"; \
          rm /tmp/ospf-md5.$PPID;                                       \
       else                                                             \
-         vtysh -c \"configure terminal\"   \
+         vyatta-vtysh -c \"configure terminal\"   \
            -c \"router ospf\"                                          \
            -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
            message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";           \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index 11ab9ed6..dfb75d71 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -1,7 +1,7 @@
 help: Set MD5 key id
 commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password already set"
 
-create: vtysh                          \
+create: vyatta-vtysh                          \
           -c "configure terminal"                                  \
           -c "router ospf"                                         \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@)  \
@@ -9,7 +9,7 @@ create: vtysh                          \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
             authentication message-digest";
 
-delete: vtysh                          \
+delete: vyatta-vtysh                          \
           -c "configure terminal"                                  \
           -c "router ospf"                                         \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@)     \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
index efa697c1..3d26dc01 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/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 "router ospf"             \
           -c "area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key $VAR(@) "
 
-delete: vtysh                         \
+delete: vyatta-vtysh                         \
           -c "configure terminal" -c "router ospf"                \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key";
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index 8ce008a3..f61b8e2d 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,10 +1,10 @@
 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\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index 2d378bd7..a2922c43 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,10 +1,10 @@
 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\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
 comp_help: possible completions:
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index faa4ba8d..e2c6a17f 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,11 +1,11 @@
 type: u32
 help: Set interval between retransmitting lost link state advertisements
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval \"; "
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index 13a58564..4caab873 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,10 +1,10 @@
 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\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
 comp_help: possible completions: