summaryrefslogtreecommitdiff
path: root/templates/interfaces/ethernet
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/interfaces/ethernet
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/interfaces/ethernet')
-rw-r--r--templates/interfaces/ethernet/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
50 files changed, 100 insertions, 100 deletions
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
index a6a96153..d4b4ceaa 100644
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
@@ -1,8 +1,8 @@
help: Set to ignore link state changes on this interface
-update:vtysh -c "configure terminal" \
+update:vyatta-vtysh -c "configure terminal" \
-c "interface $VAR(../@)" \
-c "no link-detect"
-delete:vtysh -c "configure terminal" \
+delete:vyatta-vtysh -c "configure terminal" \
-c "interface $VAR(../@)" \
-c "link-detect"
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 6dddc00c..0d156a55 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID"
end:expression: "\
if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../@) \" \
-c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
fi; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
index a261e064..341af509 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 8e2932ce..95215c89 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication \" \
-c \"ip ospf authentication-key $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def
index d573a2fe..309d2f17 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def
@@ -2,12 +2,12 @@ type: u32
help: Set bandwidth for specified interface (kilobits/sec)
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
"Must be between 1-10000000"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../@) \" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../@) \" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
index 57578f7d..d57876cd 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set interface cost
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 \"interface $VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
index 6d781687..5e4170cb 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval after which a neighbor is declared dead
default: 40
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
index 062b3db6..885ccb43 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval between hello packets
default: 10
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
index 9f5c3a60..1bce2ca9 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../@)\" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../@)\" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
index 627203d4..347aee8a 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
@@ -3,12 +3,12 @@ help: Set network type
syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
"Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../@) \" \
-c \"ip ospf network $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
index f3ca3dde..32321e3b 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set router priority
default: 1
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"no ip ospf priority \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
index deff2cc7..a325fe38 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval between retransmitting lost link state advertisements
default: 5
syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"no ip ospf retransmit-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
index b9ba6180..2c64ca30 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set link state transmit delay
default: 1
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-c \"no ip ospf transmit-delay \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index 09a7121d..bcebd5ab 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
-c \"ip rip authentication mode md5\" \
-c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
-c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \
-c \"key-string $VAR(@)\" "
-delete:expression: "vtysh --noerror \
+delete:expression: "vyatta-vtysh --noerror \
-c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
-c \"no ip rip authentication mode md5\" \
-c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
index dd9f73a6..e21e5878 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -8,12 +8,12 @@ syntax:expression: exec " \
commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-update: vtysh \
+update: vyatta-vtysh \
-c "configure terminal" -c "interface $VAR(../../../../@)" \
-c "ip rip authentication mode text" \
-c "ip rip authentication string $VAR(@)";
-delete: vtysh \
+delete: vyatta-vtysh \
-c "configure terminal" -c "interface $VAR(../../../../@)" \
-c "no ip rip authentication mode" \
-c "no ip rip authentication string $VAR(@)";
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
index 06a24247..f40e77d1 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index b9b3baed..f608d9c3 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable poison reverse for split-horizon
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" \
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 639bbb85..1b70a938 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID"
end:expression: "\
if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../../@) \" \
-c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
fi; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
index 1117b1c5..2814e66b 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 13c4df44..f8432137 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication \" \
-c \"ip ospf authentication-key $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
index 9fc3806c..c2660d09 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
@@ -2,12 +2,12 @@ type: u32
help: Set bandwidth in kilobits/sec
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
"Must be between 1-10000000"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface pppoe$VAR(../../../@) \" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface pppoe$VAR(../../../@) \" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
index aa575c31..f9459d6a 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
@@ -1,10 +1,10 @@
type: u32
help: Set interface cost
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 \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vtysh -c \"configure terminal\" \
+delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
index 3725b59e..8edaca26 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval after which a neighbor is declared dead
default: 40
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
index c2a34d69..93e2d7a1 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval between HELLO packets
default: 10
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
index bc33fc57..966566a4 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def
index 0debefa4..132c663a 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def
@@ -3,12 +3,12 @@ help: Set network type
syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
"Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface pppoe$VAR(../../../@) \" \
-c \"ip ospf network $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface pppoe$VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
index fd943d67..acc84ac0 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set router priority
default: 1
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf priority \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
index 4b271ea7..92884596 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set interval between retransmitting lost link state advertisements
default: 5
syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf retransmit-interval \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
index 489ebcf5..78fd0e10 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
@@ -2,10 +2,10 @@ type: u32
help: Set link state transmit delay
default: 1
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
-c \"no ip ospf transmit-delay \"; "
comp_help: possible completions:
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index bb9e1725..c7b1cfe5 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \
-c \"ip rip authentication mode md5\" \
-c \"ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \
-c \"key chain pppoe$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \
-c \"key-string $VAR(@)\" "
-delete:expression: "vtysh --noerror \
+delete:expression: "vyatta-vtysh --noerror \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \
-c \"no ip rip authentication mode md5\" \
-c \"no ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
index fb61849a..9d147205 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -6,12 +6,12 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \
-c \"ip rip authentication mode text\" \
-c \"ip rip authentication string $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \
-c \"no ip rip authentication mode\" \
-c \"no ip rip authentication string $VAR(@)\"; "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
index f1984d17..1ca1dd11 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index ba3ac6a0..76b03e21 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable split-horizon with poison reverse
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface pppoe$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
index 53aa02a7..250c9a41 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
@@ -1,9 +1,9 @@
help: Set to ignore link state changes on this interface
-update:vtysh -c "configure terminal\" \
+update:vyatta-vtysh -c "configure terminal\" \
-c "interface $VAR(../../@).$VAR(../@)" \
-c "no link-detect"
-delete:vtysh -c "configure terminal" \
+delete:vyatta-vtysh -c "configure terminal" \
-c "interface $VAR(../../@).$VAR(../@)" \
-c "link-detect"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
index 3d90cdf7..54628133 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
@@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID"
end:expression: "\
if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vtysh -c \"configure terminal\" \
+ vyatta-vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \
-c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
fi; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def
index 01d15acc..8f0d87de 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 517dd414..0f10b991 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication \" \
-c \"ip ospf authentication-key $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def
index 2506eaf3..25ef0e1e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def
@@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec)
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
"Must be between 1-10000000"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def
index 2efe26fe..bf48e818 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def
@@ -2,12 +2,12 @@ type: u32
help: Set interface cost
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def
index ee058345..2ed57960 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def
@@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead
default: 40
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def
index 42e06580..e5a0de68 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def
@@ -3,12 +3,12 @@ help: Set interval between hello packets
default: 10
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def
index 4927d353..8636b767 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def
index bfdb6a7c..92c0d77d 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def
@@ -3,12 +3,12 @@ help: Set network type
syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
"Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf network $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def
index 5b8e9d85..01db7f60 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def
@@ -3,12 +3,12 @@ help: Set router priority
default: 1
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf priority \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def
index 1aa7d14d..6b3c8e38 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def
@@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements
default: 5
syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf retransmit-interval $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf retransmit-interval \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def
index 7e802675..cbb93986 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def
@@ -3,12 +3,12 @@ help: Set link state transmit delay
default: 1
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"ip ospf transmit-delay $VAR(@) \"; "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf transmit-delay \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index e21df1ad..73aa92d2 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vtysh \
+update:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \
-c \"ip rip authentication mode md5 \" \
@@ -16,7 +16,7 @@ update:expression: "vtysh \
-c \"key $VAR(../@) \" \
-c \"key-string $VAR(@) \" "
-delete:expression: "vtysh --noerror \
+delete:expression: "vyatta-vtysh --noerror \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip rip authentication mode md5 \" \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
index 55ef8d53..acf34ef9 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -8,13 +8,13 @@ syntax:expression: exec " \
commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-update: vtysh \
+update: vyatta-vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../@).$VAR(../../../../@)" \
-c "ip rip authentication mode text" \
-c "ip rip authentication string $VAR(@)"
-delete: vtysh \
+delete: vyatta-vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../@).$VAR(../../../../@)" \
-c "no ip rip authentication mode" \
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def
index 38d26b78..d38e883e 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index e7cdcf73..24b76c23 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable split-horizon with poison reverse
-create:expression: "vtysh \
+create:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vtysh \
+delete:expression: "vyatta-vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "