summaryrefslogtreecommitdiff
path: root/templates/protocols
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-08-12 12:29:28 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-08-12 12:29:28 -0700
commitfa69d96c5958a579900600734549038ac12e93bc (patch)
treef91a61d9de326812808ec75badfd316de9d2ce77 /templates/protocols
parent588492cf8a9ddf438b649c6db4986bcab9c22435 (diff)
downloadvyatta-cfg-quagga-fa69d96c5958a579900600734549038ac12e93bc.tar.gz
vyatta-cfg-quagga-fa69d96c5958a579900600734549038ac12e93bc.zip
Revert "Replace vyatta-vtysh with vtysh"
This reverts commit 588492cf8a9ddf438b649c6db4986bcab9c22435.
Diffstat (limited to 'templates/protocols')
-rw-r--r--templates/protocols/bgp/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/aggregate-address/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/network/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def8
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/network/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/cluster-id/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/router-id/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/scan-time/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/connected/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/ospf/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/rip/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/static/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/timers/node.def4
-rw-r--r--templates/protocols/ospf/access-list/node.tag/export/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/normal/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def6
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def6
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/authentication/node.def6
-rw-r--r--templates/protocols/ospf/area/node.tag/network/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.def14
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/shortcut/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def4
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def4
-rw-r--r--templates/protocols/ospf/auto-cost/reference-bandwidth/node.def4
-rw-r--r--templates/protocols/ospf/default-information/originate/node.def4
-rw-r--r--templates/protocols/ospf/default-metric/node.def4
-rw-r--r--templates/protocols/ospf/distance/global/node.def4
-rw-r--r--templates/protocols/ospf/distance/ospf/node.def4
-rw-r--r--templates/protocols/ospf/log-adjacency-changes/detail/node.def4
-rw-r--r--templates/protocols/ospf/log-adjacency-changes/node.def4
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/administrative/node.def4
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def4
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def4
-rw-r--r--templates/protocols/ospf/mpls-te/enable/node.def4
-rw-r--r--templates/protocols/ospf/mpls-te/router-address/node.def4
-rw-r--r--templates/protocols/ospf/neighbor/node.def4
-rw-r--r--templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def4
-rw-r--r--templates/protocols/ospf/neighbor/node.tag/priority/node.def4
-rw-r--r--templates/protocols/ospf/node.def4
-rw-r--r--templates/protocols/ospf/parameters/abr-type/node.def4
-rw-r--r--templates/protocols/ospf/parameters/opaque-lsa/node.def4
-rw-r--r--templates/protocols/ospf/parameters/rfc1583-compatibility/node.def4
-rw-r--r--templates/protocols/ospf/parameters/router-id/node.def4
-rw-r--r--templates/protocols/ospf/passive-interface/node.def8
-rw-r--r--templates/protocols/ospf/redistribute/bgp/node.def4
-rw-r--r--templates/protocols/ospf/redistribute/connected/node.def4
-rw-r--r--templates/protocols/ospf/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/ospf/redistribute/rip/node.def4
-rw-r--r--templates/protocols/ospf/redistribute/static/node.def4
-rw-r--r--templates/protocols/ospf/refresh/timers/node.def4
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/node.def4
-rw-r--r--templates/protocols/rip/default-distance/node.def4
-rw-r--r--templates/protocols/rip/default-information/originate/node.def4
-rw-r--r--templates/protocols/rip/default-metric/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/access-list/in/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/access-list/out/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/prefix-list/in/node.def4
-rw-r--r--templates/protocols/rip/distribute-list/prefix-list/out/node.def4
-rw-r--r--templates/protocols/rip/interface/node.def4
-rw-r--r--templates/protocols/rip/neighbor/node.def4
-rw-r--r--templates/protocols/rip/network-distance/node.def4
-rw-r--r--templates/protocols/rip/network/node.def4
-rw-r--r--templates/protocols/rip/node.def4
-rw-r--r--templates/protocols/rip/passive-interface/node.def8
-rw-r--r--templates/protocols/rip/redistribute/bgp/node.def4
-rw-r--r--templates/protocols/rip/redistribute/connected/node.def4
-rw-r--r--templates/protocols/rip/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/rip/redistribute/ospf/node.def4
-rw-r--r--templates/protocols/rip/redistribute/static/node.def4
-rw-r--r--templates/protocols/rip/route/node.def4
-rw-r--r--templates/protocols/rip/timers/node.def4
-rw-r--r--templates/protocols/ripng/aggregate-address/node.def4
-rw-r--r--templates/protocols/ripng/default-information/originate/node.def4
-rw-r--r--templates/protocols/ripng/default-metric/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/access-list/in/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/access-list/out/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/prefix-list/in/node.def4
-rw-r--r--templates/protocols/ripng/distribute-list/prefix-list/out/node.def4
-rw-r--r--templates/protocols/ripng/interface/node.def4
-rw-r--r--templates/protocols/ripng/network/node.def4
-rw-r--r--templates/protocols/ripng/node.def4
-rw-r--r--templates/protocols/ripng/passive-interface/node.def8
-rw-r--r--templates/protocols/ripng/redistribute/bgp/node.def4
-rw-r--r--templates/protocols/ripng/redistribute/connected/node.def4
-rw-r--r--templates/protocols/ripng/redistribute/kernel/node.def4
-rw-r--r--templates/protocols/ripng/redistribute/ospfv3/node.def4
-rw-r--r--templates/protocols/ripng/redistribute/static/node.def4
-rw-r--r--templates/protocols/ripng/route/node.def4
-rw-r--r--templates/protocols/ripng/timers/node.def4
-rw-r--r--templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def4
-rw-r--r--templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def4
-rw-r--r--templates/protocols/static/route/node.tag/blackhole/node.def4
-rw-r--r--templates/protocols/static/route/node.tag/next-hop/node.def4
-rw-r--r--templates/protocols/static/route6/node.tag/blackhole/node.def4
-rw-r--r--templates/protocols/static/route6/node.tag/next-hop/node.def4
177 files changed, 374 insertions, 374 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 1fb54cce..69c2daab 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -3,8 +3,8 @@ type: u32
help: Configure Border Gateway Protocol (BGP) parameters
comp_help: \1 <1-4294967294>\tAS number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "AS number must be between 1 and 4294967294"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(@)"
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
# we need to set default parameters in BGP here since we can't do it in
# startup scripts as we don't know the AS number at that point
-update: vtysh -c "configure terminal" -c "router bgp $VAR(@)" -c "bgp network import-check"
-delete: vtysh -c "configure terminal" -c "no router bgp $VAR(@)"
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" -c "bgp network import-check"
+delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def
index 1fa743c4..19eae4e3 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def
@@ -4,7 +4,7 @@ help: Set a BGP aggregate network
comp_help: \1 <x.x.x.x/x>\taggregate network
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID
-end: vtysh --noerror \
+end: vyatta-vtysh --noerror \
-c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "no aggregate-address $VAR(@)";
@@ -17,7 +17,7 @@ end: vtysh --noerror \
if ${vyatta_sbindir}/vyatta_quagga_utils.pl --exists 'protocols bgp $VAR(../@) aggregate-address $VAR(@) summary-only' ; then
cond="$cond summary-only";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "aggregate-address $VAR(@) $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def b/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def
index 37b76fe8..cb260727 100644
--- a/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/aggregate-address/node.def
@@ -8,7 +8,7 @@ syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID
-end: vtysh -n -c "configure terminal" \
+end: vyatta-vtysh -n -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "no ipv6 bgp aggregate-address $VAR(@)";
if [ -f "/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID" ]; then
@@ -17,7 +17,7 @@ end: vtysh -n -c "configure terminal" \
if [ -n "$VAR(./summary-only)" ]; then
cond="$cond summary-only";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "ipv6 bgp aggregate-address $VAR(@) $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/ipv6/network/node.def b/templates/protocols/bgp/node.tag/ipv6/network/node.def
index 81052ea2..cfe2d8a7 100644
--- a/templates/protocols/bgp/node.tag/ipv6/network/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/network/node.def
@@ -6,10 +6,10 @@ comp_help:
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "ipv6 bgp network $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "no ipv6 bgp network $VAR(@)";
diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def
index 2af59605..34ef9014 100644
--- a/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/connected/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute connected routes into BGP
delete: touch /tmp/bgp-redist-connected.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no redistribute connected";
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "redistribute connected $cond";
diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def
index 0b83aee9..a3915423 100644
--- a/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/kernel/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute kernel routes into BGP
delete: touch /tmp/bgp-redist-kernel.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no redistribute kernel ";
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "redistribute kernel $cond";
diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def
index d9a08db7..ae44b906 100644
--- a/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/ospfv3/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes into BGP
delete: touch /tmp/bgp-redist-ospf.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no redistribute ospf6";
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "redistribute ospf6 $cond";
diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def
index dd24ef27..4ba7c3a1 100644
--- a/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/ripng/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute RIPng routes into BGP
delete: touch /tmp/bgp-redist-rip.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no redistribute ripng";
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "redistribute ripng $cond";
diff --git a/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def b/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def
index b59edfc4..23f40710 100644
--- a/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/ipv6/redistribute/static/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute static routes into BGP
delete: touch /tmp/bgp-redist-static.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no redistribute static";
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "redistribute static $cond";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index 77e7eca0..2699782b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -10,13 +10,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
update: if /opt/vyatta/sbin/vyatta-bgp.pl --check-if-peer-group \
--peergroup $VAR(@); then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "neighbor $VAR(@) peer-group";
fi;
delete: /opt/vyatta/sbin/vyatta-bgp.pl --check-peer-groups \
--peergroup $VAR(@) --as $VAR(../@);
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "no neighbor $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
index aec3b443..7544aeec 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
@@ -8,8 +8,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) advertisement-interval $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) advertisement-interval"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
index d1c8ba0b..f4442693 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
@@ -1,7 +1,7 @@
help: Set to accept a route that contains the local-AS in the as-path
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID
-end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) allowas-in ";
if [ -f "/tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID" ]; then
rm -rf /tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID;
@@ -11,7 +11,7 @@ end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) allowas-in $VAR(./number/@)";
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
index df87799b..37cec991 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
@@ -2,7 +2,7 @@ help: Set whether BGP attributes are sent unchanged
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set attribute-unchanged for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID
-end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) attribute-unchanged ";
if [ -f "/tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID" ]; then
rm -rf /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID;
@@ -25,7 +25,7 @@ end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) attribute-unchanged $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
index 866e27ab..7c41868c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
@@ -5,9 +5,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) capability dynamic"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) capability dynamic"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
index 6d389870..693b764e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../../../peer-group/@)\"; \
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \
-c "neighbor $VAR(../../../../@) $peer" \
-c "neighbor $VAR(../../../../@) capability orf prefix-list receive"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../../../@)" \
-c "no neighbor $VAR(../../../../@) capability orf prefix-list receive"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
index 4ffb1aaa..73f1768f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
@@ -6,9 +6,9 @@ update:expression: "if [ -n \"$VAR(../../../../remote-as/@)\" ]; then \
else \
peer=\"peer-group $VAR(../../../../peer-group/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \
-c \"neighbor $VAR(../../../../@) $peer\" \
-c \"neighbor $VAR(../../../../@) capability orf prefix-list send\" "
-delete:expression: "vtysh --noerror -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \
+delete:expression: "vyatta-vtysh --noerror -c \"configure terminal\" -c \"router bgp $VAR(../../../../../@)\" \
-c \"no neighbor $VAR(../../../../@) capability orf prefix-list send\" "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
index ad67a0aa..e318a3ae 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
@@ -2,7 +2,7 @@ help: Set to send default route to this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocold bgp $VAR(../../@) neighbor $VAR(../@): you can't set default-originate for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID
-end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) default-originate ";
if [ -f "/tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID" ]; then
rm -rf /tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID;
@@ -15,7 +15,7 @@ end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) default-originate $cond"; \
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
index a15d36ea..c10cfbb4 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
@@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) dont-capability-negotiate "
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) dont-capability-negotiate"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
index bf96e198..e3ad1593 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
@@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) disable-connected-check"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) disable-connected-check"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
index 566cec88..b480dd29 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "no neighbor $VAR(../../@) send-community extended"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) send-community extended"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
index fb03e0ea..0de7a6c3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "no neighbor $VAR(../../@) send-community standard"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) send-community standard"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
index df168f81..35c78cb3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
@@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) distribute-list $VAR(@) out"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) distribute-list $VAR(@) out"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
index c7be3927..378ea604 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
@@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) distribute-list $VAR(@) in"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) distribute-list $VAR(@) in"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
index a032f8a4..6f3d4bf6 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
@@ -8,9 +8,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) ebgp-multihop $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) ebgp-multihop"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
index ed71482b..e116f9b4 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
@@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) filter-list $VAR(@) out"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) filter-list $VAR(@) out"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
index 5e130417..f6ef4a99 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
@@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) filter-list $VAR(@) in"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) filter-list $VAR(@) in"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
index fc4bee9e..c70da32f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
@@ -4,7 +4,7 @@ commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../
commit:expression: $VAR(./local-as/@) != $VAR(../../@); "protocols bgp $VAR(../../@) neighbor $VAR(../@) local-as: you can't set a different local-as for iBGP neighbors"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) local-as: you can't set local-as for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID
-end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) local-as ";
if [ -f "/tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID" ]; then
rm -rf /tmp/bgp-neighbor-$VAR(../@)-local-as.$PPID;
@@ -26,7 +26,7 @@ end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) local-as $VAR(./local-as/@) $cond ";
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
index 57ec5c20..2d8cd1ef 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
@@ -7,9 +7,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) maximum-prefix $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) maximum-prefix"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
index 78e93fa7..e1bd2ce7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) next-hop-self"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) next-hop-self "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
index b403b38b..12e156ac 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) override-capability"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) override-capability"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
index 812def6a..e50e6686 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
@@ -5,9 +5,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) passive"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) passive"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
index 1d527a7d..922ff28a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def
@@ -10,10 +10,10 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) password $VAR(@)"
-delete: vtysh \
+delete: vyatta-vtysh \
-c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) password"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
index 66d80b69..26f54db7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec "if [ -n \"`echo $VAR(../@) | sed 's/[0-9]\\{1,3\\}.[0-9
fi; "; "peer-group token may not be specified for a peer-group"
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --peergroup=$VAR(@) --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) neighbor $VAR(@)\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) peer-group: peer-group $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) peer-group $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) peer-group $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
index edf597a0..333f06b0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
@@ -9,10 +9,10 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) port $VAR(@)"
-delete: vtysh --noerror \
+delete: vyatta-vtysh --noerror \
-c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) port"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
index 34f340f2..4de56dfe 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
@@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) prefix-list $VAR(@) out"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) prefix-list $VAR(@) out"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
index 0e5789ee..5696359c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
@@ -10,9 +10,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) prefix-list $VAR(@) in"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) prefix-list $VAR(@) in"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index bdfbed73..0381d22b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -7,12 +7,12 @@ comp_help:
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \
"remote-as must be between 1 and 4294967294"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) remote-as $VAR(@)";
if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@)
then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) activate" \
-c "address-family ipv6" \
@@ -20,12 +20,12 @@ update: vtysh -c "configure terminal" \
fi
#remote-as needs to be set 1st & deleted last - comment out for now
-#delete: vtysh -c "configure terminal" \
+#delete: vyatta-vtysh -c "configure terminal" \
# -c "router bgp $VAR(../../@)" \
# -c "no neighbor $VAR(../@) remote-as $VAR(@)";
delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../@)
then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) activate" \
-c "address-family ipv6" \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
index 7ab5449d..70af0e3b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) remove-private-AS"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) remove-private-AS"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
index 15c08f44..75cd25dc 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
@@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) route-map $VAR(@) out"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) route-map $VAR(@) out"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
index d3d196c7..d6fa203e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
@@ -9,9 +9,9 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
else
peer="peer-group $VAR(../../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) route-map $VAR(@) in"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) route-map $VAR(@) in"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
index 66db083e..405b47d5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
@@ -7,9 +7,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) route-reflector-client"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) route-reflector-client"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
index c69fe9b5..46848522 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
@@ -6,9 +6,9 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) route-server-client"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) route-server-client"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
index 2d7ffec2..817d4966 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
@@ -5,8 +5,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) shutdown"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) shutdown"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
index faabfd4c..841f4e57 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
@@ -9,13 +9,13 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
fi;
if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@)
then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "address-family ipv6" \
-c "neighbor $VAR(../../@) soft-reconfiguration inbound";
else
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "neighbor $VAR(../../@) $peer" \
-c "neighbor $VAR(../../@) soft-reconfiguration inbound";
@@ -23,12 +23,12 @@ update: if [ -n "$VAR(../../remote-as/@)" ]; then
delete: if /opt/vyatta/sbin/vyatta-validate-type.pl -q ipv6 $VAR(../../@)
then
- vtysh -n -c "configure terminal" \
+ vyatta-vtysh -n -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "address-family ipv6" \
-c "no neighbor $VAR(../../@) soft-reconfiguration inbound";
else
- vtysh -n -c "configure terminal" \
+ vyatta-vtysh -n -c "configure terminal" \
-c "router bgp $VAR(../../../@)" \
-c "no neighbor $VAR(../../@) soft-reconfiguration inbound";
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
index 45aab6e8..1ffad91e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
@@ -6,8 +6,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) strict-capability-match"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) strict-capability-match "
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
index 2b8d75e8..b1a8eeac 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
@@ -2,9 +2,9 @@ help: Set neighbor timers
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set timers for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-timers.$PPID
-end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) timers";
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) timers connect";
if [ -f "/tmp/bgp-neighbor-$VAR(../@)-timers.$PPID" ]; then
rm -rf /tmp/bgp-neighbor-$VAR(../@)-timers.$PPID;
@@ -15,12 +15,12 @@ end: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
peer="peer-group $VAR(../peer-group/@)";
fi;
if [ -n "$VAR(./connect/@)" ]; then
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) timers connect $VAR(./connect/@)";
fi;
if [ -n "$VAR(./keepalive/@)" ] || [ -n "$VAR(./holdtime/@)" ]; then
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) timers $VAR(./keepalive/@) $VAR(./holdtime/@)";
fi;
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
index c52ebcc3..500e4ec4 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
@@ -9,8 +9,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) unsuppress-map $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) unsuppress-map $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
index 664beb4a..e631951d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
@@ -12,8 +12,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) update-source $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) update-source"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
index 75ac0190..ce016875 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
@@ -8,8 +8,8 @@ update: if [ -n "$VAR(../remote-as/@)" ]; then
else
peer="peer-group $VAR(../peer-group/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "neighbor $VAR(../@) $peer" \
-c "neighbor $VAR(../@) weight $VAR(@)"
-delete: vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh --noerror -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no neighbor $VAR(../@) weight $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def
index e8262d1b..e263d4e3 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.def
@@ -10,7 +10,7 @@ commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != "");
delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID
-end: vtysh -n -c "configure terminal" \
+end: vyatta-vtysh -n -c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "no network $VAR(@)";
if [ -f "/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID" ]; then
@@ -22,7 +22,7 @@ end: vtysh -n -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router bgp $VAR(../@)" \
-c "network $VAR(@) $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
index f91e5743..1b28dbb3 100644
--- a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
@@ -1,5 +1,5 @@
help: Set to compare MEDs from different neighbors
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp always-compare-med"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp always-compare-med"
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
index c5cf317b..1e5eadac 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
@@ -1,6 +1,6 @@
help: Set to compare AS-path lengths including confederation sets & sequences
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath as-path confed"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "no bgp bestpath as-path confed "
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
index bc364db1..7cc281fb 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
@@ -1,5 +1,5 @@
help: Set to ignore AS-path length in selecting a route
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath as-path ignore"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "no bgp bestpath as-path ignore"
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
index cd6da257..afd20542 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
@@ -1,6 +1,6 @@
help: Set to compare the router-id for identical EBGP paths
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp bestpath compare-routerid"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp bestpath compare-routerid"
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
index a2e56c64..30334b86 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
@@ -1,6 +1,6 @@
help: Set to compare MEDs among confederation paths
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath med confed"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "no bgp bestpath med confed"
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
index 89ffa368..28ccdbc7 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
@@ -1,6 +1,6 @@
help: Set to treat a route missing a MED as the least preferred one
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath med missing-as-worst"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "no bgp bestpath med missing-as-worst"
diff --git a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
index 7a413785..fb6521fc 100644
--- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
@@ -1,7 +1,7 @@
type: ipv4
help: Set the route-reflector cluster-id
comp_help: \1 <x.x.x.x>\tcluster-id IP
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp cluster-id $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp cluster-id"
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
index d69bd71a..fb4ff733 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
@@ -2,7 +2,7 @@ type: u32
help: Set confederation AS identifier
comp_help: \1 <1-4294967294>\tconfederation AS id
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp confederation identifier $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp confederation identifier"
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
index f21e7f7d..1f043d41 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
@@ -3,7 +3,7 @@ type: u32
help: Set the peer ASs in the BGP confederation
comp_help: \1 <1-4294967294>\tpeer AS number numbers (ex: "435 234")
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp confederation peers $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp confederation peers $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
index e9513221..ae05b419 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
@@ -3,10 +3,10 @@ delete:expression: "touch /tmp/bgp-dampening.$PPID"
# Note that there is a bug in quagga here. If bgpd gets two 'no bgp dampening'
# commands in a row it will crash
end: if [ -f "/tmp/bgp-dampening.$PPID" ]; then
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp dampening" ;
rm -f "/tmp/bgp-dampening.$PPID" ;
else
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp dampening $VAR(./half-life/@) $VAR(./re-use/@) $VAR(./start-suppress-time/@) $VAR(./max-suppress-time/@)" ;
fi ;
diff --git a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
index 7915bf52..1c358313 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
@@ -1,7 +1,7 @@
type: u32
help: Set the default local preference (higher=more preferred)
comp_help: \1 <0-4294967295>\tlocal preference
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp default local-preference $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp default local-preference"
diff --git a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
index b65bacf3..58a884bd 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
@@ -1,5 +1,5 @@
help: Set to deactivate IPv4 unicast for a peer by default
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp default ipv4-unicast"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp default ipv4-unicast "
diff --git a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
index d15fc5ba..26a6f72f 100644
--- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
@@ -1,5 +1,5 @@
help: Set to compare MEDs between different peers in the same AS
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp deterministic-med"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp deterministic-med"
diff --git a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
index 62adaf91..0031aea0 100644
--- a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
@@ -1,5 +1,5 @@
help: Set to disable IGP route check for network statements
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp network import-check"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp network import-check"
diff --git a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
index 269ec92f..a527ff8b 100644
--- a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
@@ -1,5 +1,5 @@
help: Set to require first AS in the path to match peer's AS
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp enforce-first-as "
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp enforce-first-as "
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
index 73cc18c5..2c92a0b5 100644
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
@@ -2,7 +2,7 @@ type: u32
help: Set the maximum time to hold onto restarting peer's stale paths
comp_help: \1 <1-3600>\thold time in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 3600; "stalepath-time must be between 1 and 3600"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp graceful-restart stalepath-time $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp graceful-restart stalepath-time"
diff --git a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
index b27054f2..9df1f912 100644
--- a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
@@ -1,5 +1,5 @@
help: Set to log neighbor up/down changes and reset reason
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp log-neighbor-changes"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp log-neighbor-changes"
diff --git a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
index a0dd5246..15512df8 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
@@ -1,5 +1,5 @@
help: Set to disable client to client route reflection
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp client-to-client reflection"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp client-to-client reflection"
diff --git a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
index 3c0a8254..3925b270 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
@@ -1,5 +1,5 @@
help: Set to disable immediate sesison reset if peer's connected link goes down
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp fast-external-failover"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp fast-external-failover"
diff --git a/templates/protocols/bgp/node.tag/parameters/router-id/node.def b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
index e80d5f19..33741ad4 100644
--- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
@@ -1,7 +1,7 @@
type: ipv4
help: Set BGP router id
comp_help: \1 <x.x.x.x>\tBGP router-id IP
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp router-id $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp router-id"
diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
index 057832f7..e8c4152f 100644
--- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
@@ -2,7 +2,7 @@ type: u32
help: Set BGP route scanner interval
comp_help: \1 <5-60>\tscan interval in seconds
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds"
-update: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp scan-time $VAR(@)"
-delete: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp scan-time"
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
index a85348f9..5a6cf333 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute connected routes into BGP
delete: touch /tmp/bgp-redist-connected.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute connected";
if [ -f "/tmp/bgp-redist-connected.$PPID" ]; then
rm -rf /tmp/bgp-redist-connected.$PPID;
@@ -11,6 +11,6 @@ end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "redistribute connected $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
index 3f2d4147..6be988b3 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute kernel routes into BGP
delete: touch /tmp/bgp-redist-kernel.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute kernel ";
if [ -f "/tmp/bgp-redist-kernel.$PPID" ]; then
rm -rf /tmp/bgp-redist-kernel.$PPID;
@@ -11,6 +11,6 @@ end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "redistribute kernel $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
index 8570d8d3..3121c8dc 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute OSPF routes into BGP
delete: touch /tmp/bgp-redist-ospf.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute ospf";
if [ -f "/tmp/bgp-redist-ospf.$PPID" ]; then
rm -rf /tmp/bgp-redist-ospf.$PPID;
@@ -11,6 +11,6 @@ end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "redistribute ospf $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
index 2695f58e..77287058 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute RIP routes into BGP
delete: touch /tmp/bgp-redist-rip.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute rip ";
if [ -f "/tmp/bgp-redist-rip.$PPID" ]; then
rm -rf /tmp/bgp-redist-rip.$PPID;
@@ -11,6 +11,6 @@ end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "redistribute rip $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def
index c2517d07..c23a5381 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute static routes into BGP
delete: touch /tmp/bgp-redist-static.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute static";
if [ -f "/tmp/bgp-redist-static.$PPID" ]; then
rm -rf /tmp/bgp-redist-static.$PPID;
@@ -11,6 +11,6 @@ end: vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
if [ -n "$VAR(./route-map/@)" ]; then
cond="$cond route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "redistribute static $cond";
fi;
diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def
index 97e3a31f..d0586116 100644
--- a/templates/protocols/bgp/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/timers/node.def
@@ -2,11 +2,11 @@ help: Set BGP protocol timers
commit:expression: $VAR(./keepalive/) != ""; "protocols bgp $VAR(../@) timers: you must set a keepalive interval"
commit:expression: $VAR(./holdtime/) != ""; "protocols bgp $VAR(../@) timers: you must set a holdtime interval"
delete: touch /tmp/bgp-timers.$PPID
-end: vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \
+end: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \
-c "no timers bgp";
if [ -f "/tmp/bgp-timers.$PPID" ]; then
rm -rf /tmp/bgp-timers.$PPID;
else
- vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \
+ vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(../@)" \
-c "timers bgp $VAR(./keepalive/@) $VAR(./holdtime/@)";
fi;
diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def
index 44521e09..0b1d1e1d 100644
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ b/templates/protocols/ospf/access-list/node.tag/export/node.def
@@ -2,10 +2,10 @@ multi:
type: txt
help: Set filter for outgoing routing updates
syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)"
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "distribute-list $VAR(../@) out $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no distribute-list $VAR(../@) out $VAR(@)";
comp_help: possible completions:
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:
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
index 0bcafe6d..9d1b9b1c 100644
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
@@ -4,14 +4,14 @@ default: 100
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \
"Must be between 1-4294967"
-update:expression: "vtysh --noerror \
+update:expression: "vyatta-vtysh --noerror \
-c \"configure terminal\" \
-c \"router ospf\" \
-c \"auto-cost reference-bandwidth $VAR(@) \"; \
echo 'OSPF: Reference bandwidth is changed.'; \
echo ' Please ensure reference bandwidth is consistent across all routers'; "
-delete:expression: "vtysh --noerror \
+delete:expression: "vyatta-vtysh --noerror \
-c \"configure terminal\" \
-c \"router ospf\" \
-c \"no auto-cost reference-bandwidth \"; \
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def
index c1646b9d..5e6e79cc 100644
--- a/templates/protocols/ospf/default-information/originate/node.def
+++ b/templates/protocols/ospf/default-information/originate/node.def
@@ -1,7 +1,7 @@
help: Set to distribute a default route
delete: touch /tmp/ospf-default-info.$PPID
end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no default-information originate";
else
@@ -24,7 +24,7 @@ end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
if [ -n "$VAR(./route-map/@)" ]; then
PARM="$PARM route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "default-information originate $PARM";
fi;
diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def
index e6f0dd3a..c2bcef57 100644
--- a/templates/protocols/ospf/default-metric/node.def
+++ b/templates/protocols/ospf/default-metric/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set metric of redistributed routes
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"default-metric $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no default-metric $VAR(@) \"; "
comp_help: possible completions:
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
index 31025a39..8eb8f75a 100644
--- a/templates/protocols/ospf/distance/global/node.def
+++ b/templates/protocols/ospf/distance/global/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set OSPF administrative distance
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"distance $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no distance $VAR(@) \"; "
comp_help: possible completions:
diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def
index 85329600..8a5bc13f 100644
--- a/templates/protocols/ospf/distance/ospf/node.def
+++ b/templates/protocols/ospf/distance/ospf/node.def
@@ -2,7 +2,7 @@ help: Set OSPF administrative distance
delete:expression: "touch /tmp/ospf-distance.$PPID"
end:expression: "\
if [ -f \"/tmp/ospf-distance.$PPID\" ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no distance ospf\"; \
rm /tmp/ospf-distance.$PPID; \
@@ -16,7 +16,7 @@ end:expression: "\
if [ -n \"$VAR(./external/@)\" ]; then \
PARM=\"$PARM external $VAR(./external/@)\"; \
fi; \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no distance ospf\" -c \"distance ospf $PARM\"; \
fi; "
diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
index 49c8c0de..92e992fd 100644
--- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
@@ -1,6 +1,6 @@
help: Set to log all state changes
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"log-adjacency-changes detail\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"no log-adjacency-changes detail\"; "
diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def
index d8789d98..7b56f74b 100644
--- a/templates/protocols/ospf/log-adjacency-changes/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/node.def
@@ -1,7 +1,7 @@
help: Set to log changes in adjacency state
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"log-adjacency-changes\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no log-adjacency-changes\"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
index 96b17e75..d6f7b8ac 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
@@ -1,7 +1,7 @@
help: Set to administratively apply, for an indefinite period
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"max-metric router-lsa administrative\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no max-metric router-lsa administrative \"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
index 2369b7be..ebd9dd25 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set to advertise stub-router prior to full shutdown of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"max-metric router-lsa on-shutdown $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no max-metric router-lsa on-shutdown \"; "
comp_help: possible completions:
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
index e859f0fd..514a3075 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set to automatically advertise stub Router-LSA on startup of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"max-metric router-lsa on-startup $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no max-metric router-lsa on-startup \"; "
comp_help: possible completions:
diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def
index 4a24bf6e..188d0d04 100644
--- a/templates/protocols/ospf/mpls-te/enable/node.def
+++ b/templates/protocols/ospf/mpls-te/enable/node.def
@@ -1,7 +1,7 @@
help: Enable MPLS-TE functionality
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"mpls-te on\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def
index e849f8b3..fe414340 100644
--- a/templates/protocols/ospf/mpls-te/router-address/node.def
+++ b/templates/protocols/ospf/mpls-te/router-address/node.def
@@ -1,8 +1,8 @@
type: ipv4
help: Set stable IP address of the advertising router
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"mpls-te router-address $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no mpls-te\"; "
diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def
index 84491993..e1c9e9e9 100644
--- a/templates/protocols/ospf/neighbor/node.def
+++ b/templates/protocols/ospf/neighbor/node.def
@@ -1,9 +1,9 @@
tag:
type: ipv4
help: Set neighbor IP address
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"neighbor $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no neighbor $VAR(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
index b5e39099..cd8babb2 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set dead neighbor polling interval
default: 60
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "neighbor $VAR(../@) poll-interval $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "neighbor $VAR(../@) poll-interval 60";
comp_help: possible completions:
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index 6772e988..ae89ff6f 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set neighbor priority in seconds
default: 0
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "neighbor $VAR(../@) priority $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "neighbor $VAR(../@) priority 0";
comp_help: possible completions:
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index 0ee99023..7870a8cb 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,5 +1,5 @@
help: Configure Open Shortest Path First protocol (OSPF) parameters
-create:expression: "vtysh -c \"configure terminal\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"no router ospf\" "
diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def
index cb1b588c..2b80f14a 100644
--- a/templates/protocols/ospf/parameters/abr-type/node.def
+++ b/templates/protocols/ospf/parameters/abr-type/node.def
@@ -2,10 +2,10 @@ type: txt
help: Set OSPF ABR type
default: "cisco"
syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "ospf abr-type $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "ospf abr-type cisco";
comp_help: possible completions:
diff --git a/templates/protocols/ospf/parameters/opaque-lsa/node.def b/templates/protocols/ospf/parameters/opaque-lsa/node.def
index be999e27..7faf64b6 100644
--- a/templates/protocols/ospf/parameters/opaque-lsa/node.def
+++ b/templates/protocols/ospf/parameters/opaque-lsa/node.def
@@ -1,6 +1,6 @@
help: Enable the Opaque-LSA capability (rfc2370)
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"ospf opaque-lsa \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"no ospf opaque-lsa \"; "
diff --git a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
index 9de29ecf..dfef025d 100644
--- a/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
+++ b/templates/protocols/ospf/parameters/rfc1583-compatibility/node.def
@@ -1,5 +1,5 @@
help: Enable rfc1583 criteria for handling AS external routes
-create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"ospf rfc1583compatibility \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router ospf\" \
-c \"no ospf rfc1583compatibility \"; "
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index abd4211d..8b1011ec 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,8 +1,8 @@
type: ipv4
help: Set to override the default router identifier
-update:expression: "vtysh -c \"configure terminal\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"ospf router-id $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no ospf router-id \" "
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index 9a087c44..480d084e 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -8,21 +8,21 @@ syntax:expression: exec " \
fi ; "
update:expression: " \
if [ x$VAR(x) == xdefault ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"passive-interface default\"; \
else \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"passive-interface $VAR(@)\"; \
fi; "
delete:expression: " \
if [ x$VAR(x) == xdefault ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no passive-interface default\"; \
else \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"router ospf\" \
-c \"no passive-interface $VAR(@)\"; \
fi; "
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
index 573b0e82..a3e04d6d 100644
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute BGP routes
delete:expression: "touch /tmp/ospf-redist-bgp.$PPID"
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no redistribute bgp";
if [ -f "/tmp/ospf-redist-bgp.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "redistribute bgp $COND";
fi;
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
index 98b864fd..be4f6d0e 100644
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ b/templates/protocols/ospf/redistribute/connected/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute connected routes
delete:expression: "touch /tmp/ospf-redist-connected.$PPID"
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no redistribute connected";
if [ -f "/tmp/ospf-redist-connected.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "redistribute connected $COND";
fi;
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
index 5e2fc586..605e72a8 100644
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute kernel routes
delete:expression: "touch /tmp/ospf-redist-kernel.$PPID"
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no redistribute kernel";
if [ -f "/tmp/ospf-redist-kernel.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "redistribute kernel $COND";
fi;
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
index 48552329..6d29347b 100644
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ b/templates/protocols/ospf/redistribute/rip/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute RIP routes
delete:expression: "touch /tmp/ospf-redist-rip.$PPID"
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no redistribute rip";
if [ -f "/tmp/ospf-redist-rip.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "redistribute rip $COND";
fi;
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
index a9fc42d1..4e748859 100644
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ b/templates/protocols/ospf/redistribute/static/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute static routes
delete:expression: "touch /tmp/ospf-redist-static.$PPID"
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no redistribute static";
if [ -f "/tmp/ospf-redist-static.$PPID" ]; then
@@ -15,7 +15,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "redistribute static $COND";
fi;
diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def
index 055d9f26..241ee3b6 100644
--- a/templates/protocols/ospf/refresh/timers/node.def
+++ b/templates/protocols/ospf/refresh/timers/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set refresh timer
syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no refresh timer" -c "refresh timer $VAR(@)";
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no refresh timer $VAR(@)";
comp_help: possible completions:
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
index 1600d41c..44d74492 100644
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/node.def
@@ -1,12 +1,12 @@
help: Set OSPF SPF timers
delete: touch /tmp/ospf-timer.$PPID
end: if [ -f "/tmp/ospf-timer.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "no timers throttle spf";
rm /tmp/ospf-timer.$PPID;
else
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ospf" \
-c "timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)";
fi;
diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def
index 5b7996e6..79df4021 100644
--- a/templates/protocols/rip/default-distance/node.def
+++ b/templates/protocols/rip/default-distance/node.def
@@ -1,8 +1,8 @@
type: u32
help: Set administrative distance
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distance $VAR(@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distance $VAR(@) \" "
comp_help: Enter a distance valude between 1-255
diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def
index 9ecbe683..0eeb3d30 100644
--- a/templates/protocols/rip/default-information/originate/node.def
+++ b/templates/protocols/rip/default-information/originate/node.def
@@ -1,6 +1,6 @@
help: Set to distribute a default route
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"default-information originate\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no default-information originate\" "
diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def
index ea1ceb77..fb1faee8 100644
--- a/templates/protocols/rip/default-metric/node.def
+++ b/templates/protocols/rip/default-metric/node.def
@@ -1,8 +1,8 @@
type: u32
help: Set metric of redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"default-metric $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no default-metric $VAR(@) \"; "
#comp_help <1-16> Default metric
diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
index 124705b2..c4b42975 100644
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/in/node.def
@@ -1,8 +1,8 @@
type: u32
help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) in\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list $VAR(@) in\" "
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
index 77810a46..e6e21860 100644
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/out/node.def
@@ -1,8 +1,8 @@
type: u32
help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) out\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list $VAR(@) out\" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
index ac16b25f..6f5950fe 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
@@ -1,8 +1,8 @@
type: u32
help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) in $VAR(../../@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list $VAR(@) in $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
index 8f58be0f..db795ea7 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
@@ -1,7 +1,7 @@
type: u32
help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) out $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
index 4dbe19c4..73ba0933 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -1,7 +1,7 @@
type: txt
help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list prefix $VAR(@) in $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
index 51707b0f..753fda2b 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -1,7 +1,7 @@
type: txt
help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list prefix $VAR(@) out $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
index 89f95bcb..31e3afad 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
@@ -1,8 +1,8 @@
type: txt
help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) in\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list prefix $VAR(@) in\" "
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
index 598eeaa5..c6278ee1 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
@@ -1,7 +1,7 @@
type: txt
help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) out\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distribute-list prefix $VAR(@) out\" "
diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
index a8fa41f9..8a1e560e 100644
--- a/templates/protocols/rip/interface/node.def
+++ b/templates/protocols/rip/interface/node.def
@@ -6,8 +6,8 @@ syntax:expression: exec " \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
exit 1 ; \
fi ; "
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $VAR(@)\" "
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" -c \"network $VAR(@)\" "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" -c \"no network $VAR(@)\" "
allowed: local -a array;
array=( /sys/class/net/{eth,vmnet}* ) ;
echo -n ${array[@]##*/}
diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def
index f9359405..43e98ba4 100644
--- a/templates/protocols/rip/neighbor/node.def
+++ b/templates/protocols/rip/neighbor/node.def
@@ -1,8 +1,8 @@
multi:
type: ipv4
help: Set a neighbor router
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"neighbor $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no neighbor $VAR(@)\"; "
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index 74be87b8..9ec05222 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -9,10 +9,10 @@ end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \
fi; \
if [ -f \"/tmp/rip-dist.$PPID\" ]; then \
dist=$(cat /tmp/rip-network-distance.$PPID); \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no distance $dist $VAR(@) $ACL \" ;
rm -f \"/tmp/rip-dist.$PPID\";
else \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"distance $VAR(./distance/@) $VAR(@) $ACL \" ;
fi; "
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index 82ee17be..483173a4 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -2,7 +2,7 @@ multi:
type: ipv4net
help: Set RIP network
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"network $VAR(@)\"; "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no network $VAR(@)\"; "
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index f6f7b718..38d3da1a 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,4 +1,4 @@
help: Configure Routing Information Protocol (RIP) parameters
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"no router rip\" "
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" "
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"no router rip\" "
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
index a23ecf4f..1663df1b 100644
--- a/templates/protocols/rip/passive-interface/node.def
+++ b/templates/protocols/rip/passive-interface/node.def
@@ -7,17 +7,17 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
update:expression: "if [ x$VAR(x) == xdefault ]; then \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"passive-interface default\"; \
else \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"passive-interface $VAR(@)\"; \
fi; "
delete:expression: "if [ x$VAR(x) == xdefault ]; then \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no passive-interface default\"; \
else \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no passive-interface $VAR(@)\"; \
fi; "
allowed: local -a array;
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
index 1ac42adb..ac9076ab 100644
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ b/templates/protocols/rip/redistribute/bgp/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute BGP routes
delete:expression: "touch /tmp/rip-redist-bgp.$PPID"
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute bgp \"; \
if [ -f \"/tmp/rip-redist-bgp.$PPID\" ]; then \
rm -rf /tmp/rip-redist-bgp.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
if [ -n \"$VAR(./route-map/@)\" ]; then \
COND=\"$COND route-map $VAR(./route-map/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"redistribute bgp $COND\"; \
fi; "
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
index 4bd5c8c3..1ad349ac 100644
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ b/templates/protocols/rip/redistribute/connected/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute connected routes
delete:expression: "touch /tmp/rip-redist-connected.$PPID"
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute connected \"; \
if [ -f \"/tmp/rip-redist-connected.$PPID\" ]; then \
rm -rf /tmp/rip-redist-connected.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
if [ -n \"$VAR(./route-map/@)\" ]; then \
COND=\"$COND route-map $VAR(./route-map/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"redistribute connected $COND\"; \
fi; "
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
index d7ef7420..689dcfe5 100644
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ b/templates/protocols/rip/redistribute/kernel/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute kernel routes
delete:expression: "touch /tmp/rip-redist-kernel.$PPID"
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute kernel \"; \
if [ -f \"/tmp/rip-redist-kernel.$PPID\" ]; then \
rm -rf /tmp/rip-redist-kernel.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
if [ -n \"$VAR(./route-map/@)\" ]; then \
COND=\"$COND route-map $VAR(./route-map/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"redistribute kernel $COND\"; \
fi; "
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
index 8c97dba9..bad996cb 100644
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ b/templates/protocols/rip/redistribute/ospf/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute OSPF routes
delete:expression: "touch /tmp/rip-redist-ospf.$PPID"
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute ospf \"; \
if [ -f \"/tmp/rip-redist-ospf.$PPID\" ]; then \
rm -rf /tmp/rip-redist-ospf.$PPID; \
@@ -11,7 +11,7 @@ end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
if [ -n \"$VAR(./route-map/@)\" ]; then \
COND=\"$COND route-map $VAR(./route-map/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"redistribute ospf $COND\"; \
fi; "
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
index 728bf6f2..384f3735 100644
--- a/templates/protocols/rip/redistribute/static/node.def
+++ b/templates/protocols/rip/redistribute/static/node.def
@@ -1,6 +1,6 @@
help: Set to redistribute static routes
delete:expression: "touch /tmp/rip-redist-static.$PPID"
-end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+end:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute static \"; \
if [ -f \"/tmp/rip-redist-static.$PPID\" ]; then \
rm -rf /tmp/rip-redist-static.$PPID; \
@@ -11,6 +11,6 @@ end:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
if [ -n \"$VAR(./route-map/@)\" ]; then \
COND=\"$COND route-map $VAR(./route-map/@)\"; \
fi; \
- vtysh -c \"configure terminal\" -c \"router rip\" \
+ vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"redistribute static $COND\"; \
fi; "
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index 81638c9a..351e8fc3 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -2,8 +2,8 @@ multi:
type: ipv4net
help: Set RIP static route
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"route $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"router rip\" \
-c \"no route $VAR(@)\" "
diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
index 26372ec5..db2562b0 100644
--- a/templates/protocols/rip/timers/node.def
+++ b/templates/protocols/rip/timers/node.def
@@ -1,12 +1,12 @@
help: Set RIP timer values
delete:expression: "touch /tmp/rip-timers.$PPID"
-end:expression: "vtysh \
+end:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"router rip\" \
-c \"no timers basic\"; \
if [ -f \"/tmp/rip-timers.$PPID\" ]; then \
rm -rf /tmp/rip-timers.$PPID; \
else \
- vtysh \
+ vyatta-vtysh \
-c \"configure terminal\" -c \"router rip\" \
-c \"timers basic $VAR(./update/@) \
$VAR(./timeout/@) \
diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def
index 5532eb83..edd739b8 100644
--- a/templates/protocols/ripng/aggregate-address/node.def
+++ b/templates/protocols/ripng/aggregate-address/node.def
@@ -4,10 +4,10 @@ help: Set aggregate RIPng route announcement
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "aggregate-address $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no aggregate-address $VAR(@)"
diff --git a/templates/protocols/ripng/default-information/originate/node.def b/templates/protocols/ripng/default-information/originate/node.def
index eb392758..34d60cd7 100644
--- a/templates/protocols/ripng/default-information/originate/node.def
+++ b/templates/protocols/ripng/default-information/originate/node.def
@@ -1,9 +1,9 @@
help: Set to distribute a default route
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "default-information originate"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no default-information originate"
diff --git a/templates/protocols/ripng/default-metric/node.def b/templates/protocols/ripng/default-metric/node.def
index fc546c03..6af8bc3b 100644
--- a/templates/protocols/ripng/default-metric/node.def
+++ b/templates/protocols/ripng/default-metric/node.def
@@ -2,11 +2,11 @@ type: u32
help: Set metric of redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "default-metric $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no default-metric $VAR(@)"
diff --git a/templates/protocols/ripng/distribute-list/access-list/in/node.def b/templates/protocols/ripng/distribute-list/access-list/in/node.def
index f04150f0..b67087bc 100644
--- a/templates/protocols/ripng/distribute-list/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/in/node.def
@@ -3,11 +3,11 @@ help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list $VAR(@) in"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list $VAR(@) in"
diff --git a/templates/protocols/ripng/distribute-list/access-list/out/node.def b/templates/protocols/ripng/distribute-list/access-list/out/node.def
index 0c086528..9345b4b8 100644
--- a/templates/protocols/ripng/distribute-list/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list $VAR(@) out"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list $VAR(@) out"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
index a481d8ef..2297140c 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list $VAR(@) in $VAR(../../@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
index fa0c54c4..f6d3d1cc 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def
@@ -3,10 +3,10 @@ help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list $VAR(@) out $VAR(../../@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
index cd2e4aad..3f29e1b3 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list prefix $VAR(@) in $VAR(../../@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list prefix $VAR(@) in $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
index 2c847580..1173fc2f 100644
--- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list prefix $VAR(@) out $VAR(../../@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list prefix $VAR(@) out $VAR(../../@)"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
index 3897a132..dd73f83c 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list prefix $VAR(@) in"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list prefix $VAR(@) in"
diff --git a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
index 49e38358..7d13bedb 100644
--- a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def
@@ -3,10 +3,10 @@ help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
-update: vtysh -c "configure terminal" \
+update: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "distribute-list prefix $VAR(@) out"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no distribute-list prefix $VAR(@) out"
diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def
index 2dd9243e..4aa81139 100644
--- a/templates/protocols/ripng/interface/node.def
+++ b/templates/protocols/ripng/interface/node.def
@@ -8,11 +8,11 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "network $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no network $VAR(@)"
diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def
index 163ba2cc..2bbab1be 100644
--- a/templates/protocols/ripng/network/node.def
+++ b/templates/protocols/ripng/network/node.def
@@ -4,10 +4,10 @@ help: Set RIPng network
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "network $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no network $VAR(@)"
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index e2aa904b..77991f97 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,7 +1,7 @@
help: Configure Routing Information Protocol (RIPng) parameters
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "no router ripng"
diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def
index 737382b4..9654a1d3 100644
--- a/templates/protocols/ripng/passive-interface/node.def
+++ b/templates/protocols/ripng/passive-interface/node.def
@@ -9,20 +9,20 @@ syntax:expression: exec " \
fi ; "
update: if [ x$VAR(x) == xdefault ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "passive-interface default";
else
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "passive-interface $VAR(@)";
fi;
delete: if [ x$VAR(x) == xdefault ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no passive-interface default"
else
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no passive-interface $VAR(@)";
fi;
diff --git a/templates/protocols/ripng/redistribute/bgp/node.def b/templates/protocols/ripng/redistribute/bgp/node.def
index 4c44cbf6..92d01db4 100644
--- a/templates/protocols/ripng/redistribute/bgp/node.def
+++ b/templates/protocols/ripng/redistribute/bgp/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute BGP routes
delete: touch /tmp/rip-redist-bgp.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no redistribute bgp"
if [ -f "/tmp/rip-redist-bgp.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "redistribute bgp $COND";
fi
diff --git a/templates/protocols/ripng/redistribute/connected/node.def b/templates/protocols/ripng/redistribute/connected/node.def
index dfce0b34..b2c82096 100644
--- a/templates/protocols/ripng/redistribute/connected/node.def
+++ b/templates/protocols/ripng/redistribute/connected/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute connected routes
delete: touch /tmp/rip-redist-connected.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no redistribute connected"
if [ -f "/tmp/rip-redist-connected.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "redistribute connected $COND";
fi;
diff --git a/templates/protocols/ripng/redistribute/kernel/node.def b/templates/protocols/ripng/redistribute/kernel/node.def
index fa21a2fc..3023733a 100644
--- a/templates/protocols/ripng/redistribute/kernel/node.def
+++ b/templates/protocols/ripng/redistribute/kernel/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute kernel routes
delete: touch /tmp/rip-redist-kernel.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no redistribute kernel";
if [ -f "/tmp/rip-redist-kernel.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "redistribute kernel $COND";
fi;
diff --git a/templates/protocols/ripng/redistribute/ospfv3/node.def b/templates/protocols/ripng/redistribute/ospfv3/node.def
index 1df11812..cf4e37ae 100644
--- a/templates/protocols/ripng/redistribute/ospfv3/node.def
+++ b/templates/protocols/ripng/redistribute/ospfv3/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute OSPFv3 routes
delete: touch /tmp/rip-redist-ospf6.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no redistribute ospf6";
if [ -f "/tmp/rip-redist-ospf6.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "redistribute ospf6 $COND";
fi;
diff --git a/templates/protocols/ripng/redistribute/static/node.def b/templates/protocols/ripng/redistribute/static/node.def
index a47d20a5..2d142f2b 100644
--- a/templates/protocols/ripng/redistribute/static/node.def
+++ b/templates/protocols/ripng/redistribute/static/node.def
@@ -2,7 +2,7 @@ help: Set to redistribute static routes
delete: touch /tmp/rip-redist-static.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no redistribute static";
if [ -f "/tmp/rip-redist-static.$PPID" ]; then
@@ -14,7 +14,7 @@ end: vtysh -c "configure terminal" \
if [ -n "$VAR(./route-map/@)" ]; then
COND="$COND route-map $VAR(./route-map/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "redistribute static $COND";
fi;
diff --git a/templates/protocols/ripng/route/node.def b/templates/protocols/ripng/route/node.def
index e0e05796..bed064e4 100644
--- a/templates/protocols/ripng/route/node.def
+++ b/templates/protocols/ripng/route/node.def
@@ -4,11 +4,11 @@ help: Set RIPng static route
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create: vtysh -c "configure terminal" \
+create: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "route $VAR(@)"
-delete: vtysh -c "configure terminal" \
+delete: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no route $VAR(@)"
diff --git a/templates/protocols/ripng/timers/node.def b/templates/protocols/ripng/timers/node.def
index b82d4c16..a0117092 100644
--- a/templates/protocols/ripng/timers/node.def
+++ b/templates/protocols/ripng/timers/node.def
@@ -2,13 +2,13 @@ help: Set RIPng timer values
delete: touch /tmp/ripng-timers.$PPID
-end: vtysh -c "configure terminal" \
+end: vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "no timers basic"; \
if [ -f "/tmp/ripng-timers.$PPID" ]; then
rm -rf /tmp/ripng-timers.$PPID;
else
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "router ripng" \
-c "timers basic $VAR(./update/@) \
$VAR(./timeout/@) \
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index 69d55efc..da7b7864 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -35,13 +35,13 @@ syntax:expression: exec " \
delete: touch /tmp/static.$PPID
end: if [ -f "/tmp/static.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ip route $VAR(../@) $VAR(@)";
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ip route $VAR(../@) $VAR(@) $DIST";
fi;
diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
index 42ad9380..981201b3 100644
--- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def
@@ -35,13 +35,13 @@ syntax:expression: exec " \
delete: touch /tmp/static.$PPID
end: if [ -f "/tmp/static.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ipv6 route $VAR(../@) $VAR(@)";
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ipv6 route $VAR(../@) $VAR(@) $DIST";
fi;
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index 4b9dc82a..f3844833 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -3,13 +3,13 @@ help: Set to silently discard pkts when matched
delete: touch /tmp/static.$PPID
end: if [ -f "/tmp/static.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ip route $VAR(../@) null0";
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ip route $VAR(../@) null0 $DIST";
fi;
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index 4e17fd4c..e631df83 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -7,7 +7,7 @@ end: if [[ -f /tmp/static.$PPID ]]
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \
"$VAR(../@)" "$VAR(@)"
then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ip route $VAR(../@) $VAR(@)"
fi
rm -f /tmp/static.$PPID
@@ -16,6 +16,6 @@ end: if [[ -f /tmp/static.$PPID ]]
then
DIST="$VAR(./distance/@)"
fi
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ip route $VAR(../@) $VAR(@) $DIST";
fi
diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def
index bea74143..bd8601d5 100644
--- a/templates/protocols/static/route6/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route6/node.tag/blackhole/node.def
@@ -2,13 +2,13 @@ help: Set to silently discard pkts when matched
delete:expression: "touch /tmp/static.$PPID"
end: if [ -f "/tmp/static.$PPID" ]; then
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "no ipv6 route $VAR(../@) null0";
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- vtysh -c "configure terminal" \
+ vyatta-vtysh -c "configure terminal" \
-c "ipv6 route $VAR(../@) null0 $DIST";
fi;
diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def
index 1ec321fd..3f9cd440 100644
--- a/templates/protocols/static/route6/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route6/node.tag/next-hop/node.def
@@ -4,12 +4,12 @@ help: Set the next-hop IPv6 router
delete: touch /tmp/static.$PPID
end: if [ -f "/tmp/static.$PPID" ]; then
if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl "$VAR(../@)" "$VAR(@)"; then
- vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ;
+ vyatta-vtysh -c "configure terminal" -c "no ipv6 route $VAR(../@) $VAR(@)" ;
fi;
rm /tmp/static.$PPID;
else
if [ -n "$VAR(./distance/@)" ]; then
DIST="$VAR(./distance/@)";
fi;
- vtysh -c "configure terminal" -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
+ vyatta-vtysh -c "configure terminal" -c "ipv6 route $VAR(../@) $VAR(@) $DIST";
fi;