Revert "Replace vyatta-vtysh with vtysh"

This reverts commit 588492cf8a9ddf438b649c6db4986bcab9c22435.

33 files changed, 65 insertions, 65 deletions

diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def
index 5b97a5f0..977f5300 100644
--- a/templates/policy/prefix-list/node.tag/rule/node.def
+++ b/templates/policy/prefix-list/node.tag/rule/node.def
@@ -13,7 +13,7 @@ delete:  touch /tmp/protocols-$VAR(../@)-$VAR(@).$PPID ;
          if [ -n "$VAR(./le/@)" ]; then 
            cond="$cond le $VAR(./le/@) "; 
          fi; 
-         vtysh -c "configure terminal"  \
+         vyatta-vtysh -c "configure terminal"  \
            -c "no ip prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " 
 end:  len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ; 
       if [ -n "$VAR(./ge/@)" ]; then 
@@ -33,7 +33,7 @@ end:  len=`echo $VAR(./prefix/@) | awk -F/ '{ print $2 }'` ;
       if [ -f "/tmp/protocols-$VAR(../@)-$VAR(@).$PPID" ]; then 
         rm -f "protocols-$VAR(../@)-$VAR(@).$PPID" ; 
       else 
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "ip prefix-list $VAR(../@) seq $VAR(@) $VAR(./action/@) $VAR(./prefix/@) $cond " ; 
       fi ; 
       exit 0 ; 
diff --git a/templates/policy/route-map/node.tag/rule/node.def b/templates/policy/route-map/node.tag/rule/node.def
index 10832205..24bdbfc9 100644
--- a/templates/policy/route-map/node.tag/rule/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.def
@@ -4,6 +4,6 @@ help: Set a rule for this access-list
 comp_help: \1  <1-65535>\troute-map rule number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535"
 delete: if [ -f /tmp/route-map-$VAR(../@)-rule-$VAR(@)-action.$PPID ]; then
-             vtysh -c "configure terminal" -c "no route-map $VAR(../@) $VAR(./@/action/@) $VAR(@)";
+             vyatta-vtysh -c "configure terminal" -c "no route-map $VAR(../@) $VAR(./@/action/@) $VAR(@)";
              rm -f /tmp/route-map-$VAR(../@)-rule-$VAR(@)-action.$PPID;
         fi;
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
index 829631e9..872a5375 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def
@@ -5,7 +5,7 @@ comp_help: \1  permit\tpermit matching prefixes
 syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny"
 update: /opt/vyatta/sbin/vyatta-policy.pl --check-routemap-action "policy route-map $VAR(../../@) rule $VAR(../@) action";
         if [ $? -eq 0 ]; then
-          vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(@) $VAR(../@)";
+          vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(@) $VAR(../@)";
         else
           echo    "policy route-map $VAR(../../@) rule $VAR(../@): You can not change the action.";
           echo    "  To change the action you must first delete the rule ";
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
index 903f393f..25f32a56 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def
@@ -3,7 +3,7 @@ help: Set to call another route-map on match
 comp_help: \1  <txt>\t\troute-map name
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" "; "policy route-map $VAR(../../@) rule $VAR(../@) call: called route-map $VAR(@) doesn't exist" 
 commit:expression: $VAR(../action/) != ""; "policy route-map $VAR(../../@) rule $VAR(../@): you must define an action"
-update: vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
            -c "call $VAR(@)" 
-delete: vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
            -c "no call " 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def
index 2e53e0e0..fefafe2b 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def
@@ -4,9 +4,9 @@ comp_help: \1  <1-65535>\trule number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "continue must be between 1 and 65535"
 commit:expression: $VAR(@) > $VAR(../@); "you may only continue forward in the route-map"
 commit:expression: $VAR(../action/) != ""; "policy route-map $VAR(../../@) rule $VAR(../@): you must define an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
    	   -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
            -c "continue $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
 	   -c "route-map $VAR(../../@) $VAR(../action/@) $VAR(../@)" \
            -c "no continue " 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
index 8fcf6329..42e410cc 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def
@@ -3,9 +3,9 @@ help: Set a BGP as-path-list to match
 comp_help: \1  <txt>\t\tas-path-list name
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy as-path-list $VAR(@)\" "; "policy route-map $VAR(../../../@) rule $VAR(../../@) match as-path: AS path list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match as-path $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match as-path $VAR(@)" 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
index 357ee2c8..dde2ffb8 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def
@@ -3,7 +3,7 @@ delete: echo route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@) >>  /
 end:  if [ -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID ]; then
         routemap=`cat /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID`
         rm -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID;
-        vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ;
+        vyatta-vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ;
         exit 0;
       else
         if [ -z "$VAR(./community-list/@)" ]; then
@@ -25,6 +25,6 @@ end:  if [ -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-
           cond="exact-match ";
         fi ;
 
-        vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ;
-        vtysh -c "configure terminal" -c "$routemap " -c "match community $VAR(./community-list/@) $cond" ;
+        vyatta-vtysh --noerror -c "configure terminal" -c "$routemap " -c "no match community " ;
+        vyatta-vtysh -c "configure terminal" -c "$routemap " -c "match community $VAR(./community-list/@) $cond" ;
       fi
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
index ea6aa7e4..e21b08b3 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def
@@ -7,9 +7,9 @@ syntax:expression: exec " \
           echo policy route-map $VAR(../../../@) rule $VAR(../../@) match interface: interface $VAR(@) doesn\\'t exist on this system ; \
           exit 1 ; \
         fi ; "
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match interface $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match interface $VAR(@)" 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
index 735785b9..ff20b450 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
@@ -7,9 +7,9 @@ comp_help: \1  <1-99>\tIP standard access list number
 commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip address access-list: you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip address access-list: access-list $VAR(@) does not exist"
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "match ip address $VAR(@) "
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "no match ip address $VAR(@) "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
index 855b6f69..32566560 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
@@ -4,9 +4,9 @@ comp_help: \1  <txt>\t\tprefix-list name
 commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip address prefix-list: you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip address prefix-list: prefix-list $VAR(@) does not exist"
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "match ip address prefix-list $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "no match ip address prefix-list $VAR(@)"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
index caa58290..884d43e5 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def
@@ -7,9 +7,9 @@ comp_help: \1  <1-99>\tIP standard access list number
 commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop access-list: you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop access-list: access-list $VAR(@) does not exist"
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "match ip next-hop $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "no match ip next-hop $VAR(@)"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
index 5e13d9a5..3bd76736 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def
@@ -4,9 +4,9 @@ comp_help: \1  <txt>\t\tprefix-list name
 commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop prefix-list: you can only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop prefix-list: prefix-list $VAR(@) does not exist"
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "match ip next-hop prefix-list $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "no match ip next-hop prefix-list $VAR(@)"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
index c77f2bb2..dd6cd805 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def
@@ -7,9 +7,9 @@ comp_help: \1  <1-99>\tIP standard access list number
 commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source access-list: you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" "; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source access-list: access-list $VAR(@) does not exist"
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@): you must specify an action"
-update: vtysh -c "configure terminal"  \
+update: vyatta-vtysh -c "configure terminal"  \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "match ip route-source $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \
          -c "no match ip route-source $VAR(@)" 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
index 9d0b9092..0cad0615 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def
@@ -8,12 +8,12 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"poli
 
 commit:expression: $VAR(../../../../action/) != ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source prefix-list: you must specify an action"
 
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
                      -c "route-map $VAR(../../../../../@) \
                          $VAR(../../../../action/@) $VAR(../../../../@)" \
                      -c "match ip route-source prefix-list $VAR(@)"
 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
                      -c "route-map $VAR(../../../../../@) \
                          $VAR(../../../../action/@) $VAR(../../../../@)" \
                      -c "no match ip route-source prefix-list $VAR(@)" 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
index cf7edf51..d2202649 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
@@ -3,10 +3,10 @@ help: Set  metric of route to match
 comp_help: \1  <1-65535>\troute metric
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "metric must be between 1 and 65535"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match metric $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match metric $VAR(@)" 
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
index a43d7fb2..8b9abb5f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def
@@ -5,10 +5,10 @@ comp_help: \1  egp\t\texterior gateway protocol origin
   incomplete\tincomplete origin 
 syntax:expression: $VAR(@) in "egp", "igp", "incomplete"; "origin must be egp, igp, or incomplete"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match origin $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match origin $VAR(@)" 
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
index da94b0f9..da49eb8f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def
@@ -4,10 +4,10 @@ comp_help: \1  <x.x.x.x>\tpeer IP address
   local\t\tstatic or redistributed routes
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-policy.pl --check-peer-syntax $VAR(@)"; "peer must be either an IP or local"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match peer $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match peer " 
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
index 29b87acb..1038d110 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
@@ -3,10 +3,10 @@ help: Set route tag to match
 comp_help: \1  <1-65535>\troute tag
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535"
 commit:expression: $VAR(../../action) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "match tag $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no match tag $VAR(@)"
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
index 63164f95..4b9bd9aa 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def
@@ -5,9 +5,9 @@ syntax:expression: $VAR(../next/) == ""; "you may set only goto or next"
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "goto must be a rule number between 1 and 65535"
 commit:expression: $VAR(@) > $VAR(../../@); "policy route-map $VAR(../../../@) rule $VAR(../../@): you may only go forward in the route-map"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "on-match goto $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no on-match goto " 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
index 6e5aa703..16dad364 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def
@@ -1,10 +1,10 @@
 help: Set next sequence number to goto on match
 syntax:expression: $VAR(../goto/) == ""; "you may set only goto or next"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "on-match next "
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no on-match next "
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def
index eddcf92f..b64b891e 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def
@@ -4,13 +4,13 @@ commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@)
 delete: echo $VAR(./as/@) $VAR(./ip/@) > /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID
 end: if [ -f "/tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID" ]; then 
         as=$(cat /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID); 
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
           -c "no set aggregator as $as" ; 
         rm -rf /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID; 
       else 
 	as="$VAR(./as/@) $VAR(./ip/@)"; 
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
           -c "set aggregator as $as" ; 
       fi ; 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
index 2b41c884..0db66701 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
@@ -3,9 +3,9 @@ help: Set prepend string for a Border Gateway Protocol (BGP) AS-path attribute
 comp_help: \1 <txt>\t\tBGP AS path prepend string (ex: "456 64500 45001")
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-check-as-prepend.pl \"$VAR(@)\" "; "invalid AS path string"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
            -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
            -c "set as-path prepend $VAR(@)" 
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
            -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
            -c "no set as-path prepend "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
index 5a892483..bd4a4681 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def
@@ -1,8 +1,8 @@
 help: Set Border Gateway Protocol (BGP) atomic aggregate attribute
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set atomic-aggregate"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set atomic-aggregate"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def
index 3ccd9a42..382a37a8 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def
@@ -4,7 +4,7 @@ end: if [ -z "$VAR(./comm-list/)" ]; then
         echo policy route-map $VAR(../../../@) rule $VAR(../../@) set comm-list: You must configure a comm-list ; 
         exit 1 ; 
       fi ; 
-      vtysh --noerror -c "configure terminal" \
+      vyatta-vtysh --noerror -c "configure terminal" \
         -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
         -c "no set comm-list " ; 
       if [ -f "/tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-comm-list.$PPID" ]; then 
@@ -18,7 +18,7 @@ end: if [ -z "$VAR(./comm-list/)" ]; then
         if [ $? -eq 0 ]; then
           cond="delete ";
         fi ;
-        vtysh -c "configure terminal" \
+        vyatta-vtysh -c "configure terminal" \
           -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
           -c "set comm-list $VAR(./comm-list/@) $cond" ; 
       fi; 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
index def32cee..89d434b5 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def
@@ -7,9 +7,9 @@ comp_help: \1  <AA:NN>\t\tcommunity in 4 octet AS:value format
   no-advertise\tdon't advertise this route to any peer (NO_ADVERTISE)
   no-export\t\tdon't advertise outside of this AS of confederation boundry (NO_EXPORT)
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set community $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set community " 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
index e39866d0..a912d25d 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def
@@ -3,9 +3,9 @@ help: Set nexthop IP address
 comp_help: \1  <x.x.x.x>\tIP address
 # TODO: can also set to peer for BGP
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set ip next-hop $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set ip next-hop "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
index b643391e..fdcbedf4 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def
@@ -2,9 +2,9 @@ type: u32
 help: Set Border Gateway Protocol (BGP) local preference attribute
 comp_help: \1  <0-4294967295>\tlocal preference value
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set local-preference $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set local-preference "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def
index 633ea289..c2c50f5f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def
@@ -4,9 +4,9 @@ comp_help: \1  type-1\tOSPF external type 1 metric
   type-2\tOSPF external type 2 metric
 syntax:expression: $VAR(@) in "type-1", "type-2"; "Must be (type-1, type-2)"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set metric-type $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set metric-type " 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
index be83a312..df3aece7 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def
@@ -4,9 +4,9 @@ comp_help: \1  <+/-metric>\tadd or subtract metric
   <0-4294967295>\tmetric value
 syntax:expression: exec "if [ -n \"$(echo $VAR(@) | sed 's/^[+-]*[0123456789]*//')\" ]; then exit 1; fi; "; "metric must be an integer with an optional +/- prepend"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set metric $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" \
+delete: vyatta-vtysh --noerror -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set metric "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
index d84c002c..1e3dbc52 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def
@@ -5,9 +5,9 @@ comp_help: \1  igp\t\tinterior gateway protocol origin
   incomplete\tincomplete origin
 syntax:expression: $VAR(@) in "igp", "egp", "incomplete"; "origin must be one of igp, egp, or incomplete"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set origin  $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set origin "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
index 1f54bb5e..65c78d4f 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def
@@ -2,9 +2,9 @@ type: ipv4
 help: Set Border Gateway Protocol (BGP) originator ID attribute
 comp_help: \1  <x.x.x.x>\toriginator IP address
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set originator-id  $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set originator-id "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
index 3a30051d..c023b899 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def
@@ -3,9 +3,9 @@ help: Set tag value for routing protocol
 comp_help: \1  <1-65535>\t\ttag value
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535"
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set tag $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set tag "
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
index 7f831ca7..38561d24 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def
@@ -2,9 +2,9 @@ type: u32
 help: Set Border Gateway Protocol (BGP) weight attribute 
 comp_help: \1  <0-4294967295>\tBGP weight 
 commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "set weight $VAR(@) "
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
          -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \
          -c "no set weight "