diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-08-12 12:29:28 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-08-12 12:29:28 -0700 |
| commit | fa69d96c5958a579900600734549038ac12e93bc (patch) | |
| tree | f91a61d9de326812808ec75badfd316de9d2ce77 /templates/interfaces | |
| parent | 588492cf8a9ddf438b649c6db4986bcab9c22435 (diff) | |
| download | vyatta-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')
199 files changed, 398 insertions, 398 deletions
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def index 4f91ba7b..21b892df 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def index 4101633e..1b639731 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def index 7046a954..dd144cde 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def index 300685e8..6cc30c48 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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 $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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def index 1adb6d14..6aef4806 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def index 17ef4a6d..04d9d42e 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def index 08958a95..1d757fa3 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def index ce945125..313359f6 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def index 91d5756b..efff9720 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def index aaa5f927..b66d12cb 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def index ee403f74..5cfaca50 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def index 6c019092..8140597a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def index 9f8a49ce..adc85c83 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def index ab0c3016..f03902d9 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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 $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 $VAR(../../../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def index f1984d17..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def index ec07044d..0354d19b 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def @@ -1,10 +1,10 @@ help: Enable split horizon on this interface -update:expression: "vtysh \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip rip split-horizon \" " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def index 7f12ec94..ceb42582 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/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(../../../../../../@) \" \ -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/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def index fb50c58f..ae3f6c1d 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$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 pppoa$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def index d991128b..f64cd2d2 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def index 6a7cacb4..eea8c1fd 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$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 pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def index 744260f3..345283d8 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def index 00675bc9..03524fac 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vtysh -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def index 4d501423..c68141c6 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def index f085b1f5..b48d3113 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def index af479dbc..2876bb46 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def index a44d0066..9d401257 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def index 9b03711b..c5ab3dd5 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def index 89cbbb4d..3e4b9318 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def index 5e576230..7da7bcb4 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index f1080d97..4d9dfe43 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ -c \"key chain pppoa$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "vtysh --noerror \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def index 920170e3..7232ba56 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$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 pppoa$VAR(../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def index f1984d17..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def index eb029778..06161cdd 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/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 pppoa$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def index 639bbb85..1b70a938 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def index 1117b1c5..2814e66b 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def index 13c4df44..f8432137 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def index 9fc3806c..c2660d09 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def index aa575c31..f9459d6a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def index 3725b59e..8edaca26 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def index c2a34d69..93e2d7a1 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def index bc33fc57..966566a4 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def index 0debefa4..132c663a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def index fd943d67..acc84ac0 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def index 4b271ea7..92884596 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def index 489ebcf5..78fd0e10 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index bb9e1725..c7b1cfe5 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def index fb61849a..9d147205 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def index f1984d17..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def index ba3ac6a0..76b03e21 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/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/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 \" " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def index 74fad33a..cfb7842b 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def index f4626dc8..85a66781 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def index 0eb331e1..e97a3ec8 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def index 9ae02bd0..3c256074 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def @@ -1,9 +1,9 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: <1-65535> Cost diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def index cf5640f8..4bff0b1f 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def @@ -1,9 +1,9 @@ type: u32 help: Set interval after which a neighbor is declared dead syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def index bdfd7587..6e743064 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def @@ -1,8 +1,8 @@ type: u32 help: Set interval between hello packets syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def index 5a2b0c5b..ae2f1153 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,5 +1,5 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def index 5ecbd1c5..c7fcc7e7 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def @@ -5,11 +5,11 @@ syntax:expression: $VAR(@) in "non-broadcast"; \ allowed:echo non-broadcast -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/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def index c419460e..c19b3f85 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def @@ -1,8 +1,8 @@ type: u32 help: Set router priority syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: <0-255> Priority diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def index d3615938..5dac04e1 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,8 +1,8 @@ type: u32 help: Set interval between retransmitting lost link state advertisements syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: <3-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def index 4835e25f..b60ed78f 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def @@ -1,8 +1,8 @@ type: u32 help: Set link state transmit delay syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 09a7121d..bcebd5ab 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def index 268e0718..cdc9e54b 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def index 1add501a..4989b867 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/loopback/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/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def index b59ec376..17438eac 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,8 +1,8 @@ help: Enable split-horizon with poison reverse -create:expression: "vtysh -c \"configure terminal\" \ +create:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"ip rip split-horizon poisoned-reverse\" " -delete:expression: "vtysh -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def index 6dddc00c..0d156a55 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def index a261e064..341af509 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def index f55126cf..034bc793 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def index 6a92b848..279af757 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 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(../../../@) \" \ -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/multilink/node.tag/ip/ospf/cost/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def index 57578f7d..d57876cd 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def index 6d781687..5e4170cb 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def index 062b3db6..885ccb43 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def index 9f5c3a60..1bce2ca9 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/network/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def index 627203d4..347aee8a 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/priority/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def index f3ca3dde..32321e3b 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def index deff2cc7..a325fe38 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def index b9ba6180..2c64ca30 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 09a7121d..bcebd5ab 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def index 8bd383b0..efd87425 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def index 83e150bc..8fbfb898 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/multilink/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/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 1b91388d..cedfa959 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/multilink/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(../../../../@) \" \ -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/multilink/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def index 296d67d7..ed220d3d 100644 --- a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: 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/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 dfd0b214..0bf660e1 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: 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/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 f38d0655..c65bc8cb 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 \ - 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/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 ea4e6595..f4834d9e 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: "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/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 6ce486f5..220fff21 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: "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/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 b026b48d..69d9c930 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: "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/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 15b1ceea..923a7e10 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: "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/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 b3d2a7bc..d42350f4 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: "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/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 1da6ee49..49f22b82 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: "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/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 69ee5d1e..95a7d46e 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: "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/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 670ec57c..8a04c078 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: "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/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 6301a4a8..c3de8ff8 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: "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/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 7c09b718..c3fc9439 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: "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/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 fec9a615..ff0464f0 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: "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/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 5ca7296d..d55ddbab 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: "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/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 2350d977..603e66b9 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: 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/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 bbe57a3c..4079f73e 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: "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/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 76a371f0..49119ec2 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: "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 \" " 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 e2ca6181..2fc84bdd 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: vtysh -c "configure terminal" -c "interface $VAR(../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \ -c "no link-detect" -delete: vtysh -c "configure terminal" -c "interface $VAR(../@)" \ +delete: vyatta-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 dfd0b214..0bf660e1 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: 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/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 f38d0655..c65bc8cb 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 \ - 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/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 ea4e6595..f4834d9e 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: "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/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 6ce486f5..220fff21 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: "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/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 b026b48d..69d9c930 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: "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/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 15b1ceea..923a7e10 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: "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/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 b3d2a7bc..d42350f4 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: "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/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 1da6ee49..49f22b82 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: "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/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 69ee5d1e..95a7d46e 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: "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/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 670ec57c..8a04c078 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: "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/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 6301a4a8..c3de8ff8 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: "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/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 7c09b718..c3fc9439 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: "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/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 fec9a615..ff0464f0 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: "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/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 5ca7296d..d55ddbab 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: "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/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 e7767c62..2362bcae 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: 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/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 bbe57a3c..4079f73e 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: "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/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 76a371f0..49119ec2 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: "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 \" " 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 dfd0b214..0bf660e1 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: 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/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 f38d0655..c65bc8cb 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 \ - 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/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 ea4e6595..f4834d9e 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: "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/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 6ce486f5..220fff21 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: "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/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 b026b48d..69d9c930 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: "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/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 15b1ceea..923a7e10 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: "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/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 b3d2a7bc..d42350f4 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: "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/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 1da6ee49..49f22b82 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: "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/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 69ee5d1e..95a7d46e 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: "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/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 670ec57c..8a04c078 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: "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/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 6301a4a8..c3de8ff8 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: "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/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 7c09b718..c3fc9439 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: "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/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 fec9a615..ff0464f0 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: "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/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 5ca7296d..d55ddbab 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: "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/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 dfec3063..5f9c34cd 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: 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/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 a7dcca26..3c4def9e 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: "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/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 76a371f0..49119ec2 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: "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 \" " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def index 6ce3c689..250f9429 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def index b13ce50c..2c96c430 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def index f55126cf..034bc793 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def index 6a92b848..279af757 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 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(../../../@) \" \ -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/tunnel/node.tag/ip/ospf/cost/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def index 056e67b6..73282e21 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def @@ -1,12 +1,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(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vtysh \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def index 18781939..625d8a04 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def @@ -3,11 +3,11 @@ 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 \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def index 062b3db6..885ccb43 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def index 9f5c3a60..1bce2ca9 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/network/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def index 627203d4..347aee8a 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/ospf/priority/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def index 17820f08..15d48ad2 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def @@ -3,11 +3,11 @@ 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 \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def index dcdf93ce..fb75fd82 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,11 +3,11 @@ 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 \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def index 8aa68133..f8b80a10 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def @@ -2,11 +2,11 @@ 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 \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 09a7121d..bcebd5ab 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def index 037f60f7..36a3926c 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def index ce338ce0..bc32f241 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/tunnel/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/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 10b56228..fcd7a857 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/tunnel/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(../../../../@) \" \ -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 \" \ |