summaryrefslogtreecommitdiff
path: root/templates/interfaces/serial
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-08-11 18:39:24 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-08-11 18:39:24 -0700
commit588492cf8a9ddf438b649c6db4986bcab9c22435 (patch)
tree20d85b8887a806be272c39e317cfef0baba95777 /templates/interfaces/serial
parentf2d03803e6f10a430c1dc17436abd18f74b87a4d (diff)
downloadvyatta-cfg-quagga-588492cf8a9ddf438b649c6db4986bcab9c22435.tar.gz
vyatta-cfg-quagga-588492cf8a9ddf438b649c6db4986bcab9c22435.zip
Replace vyatta-vtysh with vtysh
Diffstat (limited to 'templates/interfaces/serial')
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def4
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def4
52 files changed, 104 insertions, 104 deletions
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
index 0bf660e1..dfd0b214 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
@@ -1,8 +1,8 @@
help: ignore link state changes on this interface
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "no link-detect"
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "link-detect"
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
index c65bc8cb..f38d0655 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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 \
- vyatta-vtysh -c \"configure terminal\" \
+ vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vyatta-vtysh -c \"configure terminal\" \
+ 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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
index f4834d9e..ea4e6595 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 220fff21..6ce486f5 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "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: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
index 69d9c930..b026b48d 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
index 923a7e10..15b1ceea 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
index d42350f4..b3d2a7bc 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
index 49f22b82..1da6ee49 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
index 95a7d46e..69ee5d1e 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def
index 8a04c078..670ec57c 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf network $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
index c3de8ff8..6301a4a8 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf priority \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
index c3fc9439..7c09b718 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf retransmit-interval $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf retransmit-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
index ff0464f0..fec9a615 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf transmit-delay $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf transmit-delay \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index d55ddbab..5ca7296d 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"ip rip authentication mode md5 \" \
@@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \
-c \"key $VAR(../@) \" \
-c \"key-string $VAR(@) \" "
-delete:expression: "vyatta-vtysh --noerror \
+delete:expression: "vtysh --noerror \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip rip authentication mode md5 \" \
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
index 603e66b9..2350d977 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
@@ -6,13 +6,13 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update: vyatta-vtysh \
+update: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "ip rip authentication mode text" \
-c "ip rip authentication string $VAR(@)"
-delete: vyatta-vtysh \
+delete: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "no ip rip authentication mode" \
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
index 4079f73e..bbe57a3c 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 49119ec2..76a371f0 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
index 2fc84bdd..e2ca6181 100644
--- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
@@ -1,6 +1,6 @@
help: ignore link state changes on this interface
-update: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \
+update: vtysh -c "configure terminal" -c "interface $VAR(../@)" \
-c "no link-detect"
-delete: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \
+delete: vtysh -c "configure terminal" -c "interface $VAR(../@)" \
-c "link-detect "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
index 0bf660e1..dfd0b214 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
@@ -1,8 +1,8 @@
help: ignore link state changes on this interface
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "no link-detect"
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "link-detect"
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
index c65bc8cb..f38d0655 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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 \
- vyatta-vtysh -c \"configure terminal\" \
+ vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vyatta-vtysh -c \"configure terminal\" \
+ 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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
index f4834d9e..ea4e6595 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 220fff21..6ce486f5 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "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: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
index 69d9c930..b026b48d 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
index 923a7e10..15b1ceea 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
index d42350f4..b3d2a7bc 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
index 49f22b82..1da6ee49 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
index 95a7d46e..69ee5d1e 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def
index 8a04c078..670ec57c 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf network $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
index c3de8ff8..6301a4a8 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf priority \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
index c3fc9439..7c09b718 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf retransmit-interval $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf retransmit-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
index ff0464f0..fec9a615 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf transmit-delay $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf transmit-delay \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index d55ddbab..5ca7296d 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"ip rip authentication mode md5 \" \
@@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \
-c \"key $VAR(../@) \" \
-c \"key-string $VAR(@) \" "
-delete:expression: "vyatta-vtysh --noerror \
+delete:expression: "vtysh --noerror \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip rip authentication mode md5 \" \
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
index 2362bcae..e7767c62 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/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: vyatta-vtysh \
+update: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "ip rip authentication mode text" \
-c "ip rip authentication string $VAR(@)"
-delete: vyatta-vtysh \
+delete: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "no ip rip authentication mode" \
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
index 4079f73e..bbe57a3c 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 49119ec2..76a371f0 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
index 0bf660e1..dfd0b214 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
@@ -1,8 +1,8 @@
help: ignore link state changes on this interface
-update: vyatta-vtysh -c "configure terminal" \
+update: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "no link-detect"
-delete: vyatta-vtysh -c "configure terminal" \
+delete: vtysh -c "configure terminal" \
-c "interface $VAR(../../../@).$VAR(../@)" \
-c "link-detect"
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
index c65bc8cb..f38d0655 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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 \
- vyatta-vtysh -c \"configure terminal\" \
+ vtysh -c \"configure terminal\" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip ospf message-digest-key $VAR(@)\"; \
rm /tmp/ospf-md5.$PPID; \
else \
- vyatta-vtysh -c \"configure terminal\" \
+ 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/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
index f4834d9e..ea4e6595 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
@@ -1,11 +1,11 @@
help: Set MD5 key id
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
-c \"ip ospf authentication message-digest\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
index 220fff21..6ce486f5 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
@@ -6,14 +6,14 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "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: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip ospf authentication \" \
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
index 69d9c930..b026b48d 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"bandwidth $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no bandwidth $VAR(@) \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
index 923a7e10..15b1ceea 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf cost \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
index d42350f4..b3d2a7bc 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-c \"no ip ospf dead-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
index 49f22b82..1da6ee49 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf hello-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
index 95a7d46e..69ee5d1e 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
@@ -1,10 +1,10 @@
help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf mtu-ignore\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def
index 8a04c078..670ec57c 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf network $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf network \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
index c3de8ff8..6301a4a8 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf priority \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
index c3fc9439..7c09b718 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf retransmit-interval $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf retransmit-interval \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
index ff0464f0..fec9a615 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"ip ospf transmit-delay $VAR(@) \"; "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal\" \
-c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-c \"no ip ospf transmit-delay \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
index d55ddbab..5ca7296d 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec " \
exit 1 ; \
fi ; "
-update:expression: "vyatta-vtysh \
+update:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"ip rip authentication mode md5 \" \
@@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \
-c \"key $VAR(../@) \" \
-c \"key-string $VAR(@) \" "
-delete:expression: "vyatta-vtysh --noerror \
+delete:expression: "vtysh --noerror \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-c \"no ip rip authentication mode md5 \" \
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
index 5f9c34cd..dfec3063 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/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: vyatta-vtysh \
+update: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "ip rip authentication mode text" \
-c "ip rip authentication string $VAR(@)"
-delete: vyatta-vtysh \
+delete: vtysh \
-c "configure terminal" \
-c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-c "no ip rip authentication mode" \
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
index 3c4def9e..a7dcca26 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
@@ -1,10 +1,10 @@
help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon \" "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
index 49119ec2..76a371f0 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
@@ -1,10 +1,10 @@
help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
+create:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"ip rip split-horizon poisoned-reverse \" "
-delete:expression: "vyatta-vtysh \
+delete:expression: "vtysh \
-c \"configure terminal \" \
-c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "