diff options
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 21b892df..4f91ba7b 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@) \" \ -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 1b639731..4101633e 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -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 dd144cde..7046a954 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -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 6cc30c48..300685e8 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 6aef4806..1adb6d14 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 04d9d42e..17ef4a6d 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1d757fa3..08958a95 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 313359f6..ce945125 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 efff9720..91d5756b 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 b66d12cb..aaa5f927 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 5cfaca50..ee403f74 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 8140597a..6c019092 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 adc85c83..9f8a49ce 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 f03902d9..ab0c3016 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1ca1dd11..f1984d17 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 0354d19b..ec07044d 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 ceb42582..7f12ec94 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 ae3f6c1d..fb50c58f 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface 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 f64cd2d2..d991128b 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 eea8c1fd..6a7cacb4 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh \ +delete:expression: "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 345283d8..744260f3 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 03524fac..00675bc9 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 c68141c6..4d501423 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 b48d3113..f085b1f5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 2876bb46..af479dbc 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 9d401257..a44d0066 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 c5ab3dd5..9b03711b 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 3e4b9318..89cbbb4d 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 7da7bcb4..5e576230 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 4d9dfe43..f1080d97 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 7232ba56..920170e3 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1ca1dd11..f1984d17 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 06161cdd..eb029778 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1b70a938..639bbb85 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface 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 2814e66b..1117b1c5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f8432137..13c4df44 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh \ +delete:expression: "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 c2660d09..9fc3806c 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f9459d6a..aa575c31 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 8edaca26..3725b59e 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 93e2d7a1..c2a34d69 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 966566a4..bc33fc57 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 132c663a..0debefa4 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 acc84ac0..fd943d67 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 92884596..4b271ea7 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 78fd0e10..489ebcf5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 c7b1cfe5..bb9e1725 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 9d147205..fb61849a 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1ca1dd11..f1984d17 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 76b03e21..ba3ac6a0 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 d4b4ceaa..a6a96153 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:vyatta-vtysh -c "configure terminal" \ +update:vtysh -c "configure terminal" \ -c "interface $VAR(../@)" \ -c "no link-detect" -delete:vyatta-vtysh -c "configure terminal" \ +delete: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 0d156a55..6dddc00c 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -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 341af509..a261e064 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 95215c89..8e2932ce 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 309d2f17..d573a2fe 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 d57876cd..57578f7d 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 5e4170cb..6d781687 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 885ccb43..062b3db6 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1bce2ca9..9f5c3a60 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 347aee8a..627203d4 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 32321e3b..f3ca3dde 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 a325fe38..deff2cc7 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 2c64ca30..b9ba6180 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 bcebd5ab..09a7121d 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 e21e5878..dd9f73a6 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: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)"; -delete: vyatta-vtysh \ +delete: 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 f40e77d1..06a24247 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f608d9c3..b9b3baed 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1b70a938..639bbb85 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface 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 2814e66b..1117b1c5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f8432137..13c4df44 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh \ +delete:expression: "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 c2660d09..9fc3806c 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f9459d6a..aa575c31 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 8edaca26..3725b59e 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 93e2d7a1..c2a34d69 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 966566a4..bc33fc57 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 132c663a..0debefa4 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 acc84ac0..fd943d67 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 92884596..4b271ea7 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 78fd0e10..489ebcf5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 c7b1cfe5..bb9e1725 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 9d147205..fb61849a 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1ca1dd11..f1984d17 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 76b03e21..ba3ac6a0 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 250c9a41..53aa02a7 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:vyatta-vtysh -c "configure terminal\" \ +update:vtysh -c "configure terminal\" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "no link-detect" -delete:vyatta-vtysh -c "configure terminal" \ +delete:vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/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 54628133..3d90cdf7 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/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 8f0d87de..01d15acc 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/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 0f10b991..517dd414 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/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 25ef0e1e..2506eaf3 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/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 bf48e818..2efe26fe 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/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 2ed57960..ee058345 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/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 e5a0de68..42e06580 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/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 8636b767..4927d353 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/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 92c0d77d..bfdb6a7c 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/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 01db7f60..5b8e9d85 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/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 6b3c8e38..1aa7d14d 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/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 cbb93986..7e802675 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/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 73aa92d2..e21df1ad 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "vyatta-vtysh --noerror \ +delete:expression: "vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/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 acf34ef9..55ef8d53 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: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/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 d38e883e..38d26b78 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/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 24b76c23..e7cdcf73 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/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 cfb7842b..74fad33a 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -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 85a66781..f4626dc8 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 e97a3ec8..0eb331e1 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 3c256074..9ae02bd0 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 4bff0b1f..cf5640f8 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 6e743064..bdfd7587 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +delete:expression: "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 ae2f1153..5a2b0c5b 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +create:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 c7fcc7e7..5ecbd1c5 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 c19b3f85..c419460e 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 5dac04e1..d3615938 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 b60ed78f..4835e25f 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: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "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 bcebd5ab..09a7121d 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 cdc9e54b..268e0718 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: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: 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 4989b867..1add501a 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 17438eac..b59ec376 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: "vyatta-vtysh -c \"configure terminal\" \ +create:expression: "vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"ip rip split-horizon poisoned-reverse\" " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 0d156a55..6dddc00c 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -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 341af509..a261e064 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 034bc793..f55126cf 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 279af757..6a92b848 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 d57876cd..57578f7d 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: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh -c \"configure terminal\" \ +delete:expression: "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 5e4170cb..6d781687 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 885ccb43..062b3db6 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1bce2ca9..9f5c3a60 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 347aee8a..627203d4 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 32321e3b..f3ca3dde 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 a325fe38..deff2cc7 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 2c64ca30..b9ba6180 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 bcebd5ab..09a7121d 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 efd87425..8bd383b0 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: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: 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 8fbfb898..83e150bc 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 cedfa959..1b91388d 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 ed220d3d..296d67d7 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: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "no link-detect" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def index 0bf660e1..dfd0b214 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c65bc8cb..f38d0655 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def index f4834d9e..ea4e6595 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 220fff21..6ce486f5 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def index 69d9c930..b026b48d 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def index 923a7e10..15b1ceea 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def index d42350f4..b3d2a7bc 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def index 49f22b82..1da6ee49 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def index 95a7d46e..69ee5d1e 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def index 8a04c078..670ec57c 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def index c3de8ff8..6301a4a8 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def index c3fc9439..7c09b718 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def index ff0464f0..fec9a615 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index d55ddbab..5ca7296d 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "vyatta-vtysh --noerror \ +delete:expression: "vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 603e66b9..2350d977 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,13 +6,13 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def index 4079f73e..bbe57a3c 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 49119ec2..76a371f0 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def index 2fc84bdd..e2ca6181 100644 --- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/disable-link-detect/node.def @@ -1,6 +1,6 @@ help: ignore link state changes on this interface -update: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \ +update: vtysh -c "configure terminal" -c "interface $VAR(../@)" \ -c "no link-detect" -delete: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \ +delete: vtysh -c "configure terminal" -c "interface $VAR(../@)" \ -c "link-detect " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def index 0bf660e1..dfd0b214 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c65bc8cb..f38d0655 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def index f4834d9e..ea4e6595 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 220fff21..6ce486f5 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def index 69d9c930..b026b48d 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def index 923a7e10..15b1ceea 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def index d42350f4..b3d2a7bc 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def index 49f22b82..1da6ee49 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def index 95a7d46e..69ee5d1e 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def index 8a04c078..670ec57c 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def index c3de8ff8..6301a4a8 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def index c3fc9439..7c09b718 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def index ff0464f0..fec9a615 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index d55ddbab..5ca7296d 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "vyatta-vtysh --noerror \ +delete:expression: "vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 2362bcae..e7767c62 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,13 +8,13 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def index 4079f73e..bbe57a3c 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 49119ec2..76a371f0 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def index 0bf660e1..dfd0b214 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: vyatta-vtysh -c "configure terminal" \ +update: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: vyatta-vtysh -c "configure terminal" \ +delete: vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index c65bc8cb..f38d0655 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def index f4834d9e..ea4e6595 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 220fff21..6ce486f5 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def index 69d9c930..b026b48d 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def index 923a7e10..15b1ceea 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def index d42350f4..b3d2a7bc 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def index 49f22b82..1da6ee49 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def index 95a7d46e..69ee5d1e 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def index 8a04c078..670ec57c 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def index c3de8ff8..6301a4a8 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def index c3fc9439..7c09b718 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def index ff0464f0..fec9a615 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index d55ddbab..5ca7296d 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "vyatta-vtysh \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "vyatta-vtysh --noerror \ +delete:expression: "vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 5f9c34cd..dfec3063 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,13 +8,13 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def index 3c4def9e..a7dcca26 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 49119ec2..76a371f0 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " 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 250f9429..6ce3c689 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 \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@) \"; \ rm /tmp/ospf-md5.$PPID; \ else \ - vyatta-vtysh -c \"configure terminal\" \ + vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -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 2c96c430..b13ce50c 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -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 034bc793..f55126cf 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -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 279af757..6a92b848 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 73282e21..056e67b6 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 625d8a04..18781939 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 885ccb43..062b3db6 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 1bce2ca9..9f5c3a60 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 347aee8a..627203d4 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 15d48ad2..17820f08 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 fb75fd82..dcdf93ce 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 f8b80a10..8aa68133 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: "vyatta-vtysh \ +update:expression: "vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 bcebd5ab..09a7121d 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: "vyatta-vtysh \ +update:expression: "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: "vyatta-vtysh --noerror \ +delete:expression: "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 36a3926c..037f60f7 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: vyatta-vtysh \ +update: vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: vyatta-vtysh \ +delete: 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 bc32f241..ce338ce0 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "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 fcd7a857..10b56228 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: "vyatta-vtysh \ +create:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "vyatta-vtysh \ +delete:expression: "vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ |