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 59cfc4fb..21b892df 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def index db67395e..1b639731 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def index 5b409620..dd144cde 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def index e63f500a..6cc30c48 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth in kilobits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def index c04898c8..6aef4806 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def index 34089a5e..04d9d42e 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def index ac66f126..1d757fa3 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between HELLO packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def index 3c2f9b6d..313359f6 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def index b3b0fc3e..efff9720 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def index d861fc0a..b66d12cb 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def index e532b2bf..5cfaca50 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def index 5d54cc0a..8140597a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def index c6f34eaa..adc85c83 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \ -c \"key chain $VAR(../../../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def index 29de45eb..f03902d9 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def @@ -6,12 +6,12 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def index 246f1f5c..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def index d869fdf2..0354d19b 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def @@ -1,10 +1,10 @@ help: Enable split horizon on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def index 3583f0e6..ceb42582 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def index 5bf02f80..ae3f6c1d 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def index 9c8745d5..f64cd2d2 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def index d89cbd12..eea8c1fd 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def index bb06c4d7..345283d8 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth in kilobits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def index 3686e26d..03524fac 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def index acebb86b..c68141c6 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def index b8d7e114..b48d3113 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between HELLO packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def index e29de3af..2876bb46 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def index f86c1325..9d401257 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def index ba6938dc..c5ab3dd5 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def index c8ec1ef2..3e4b9318 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def index 1c21017b..7da7bcb4 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index c81695cb..4d9dfe43 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ -c \"key chain pppoa$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def index be9f4120..7232ba56 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,12 +6,12 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def index 246f1f5c..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 91168ca2..06161cdd 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoa$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def index 36fadfb7..1b70a938 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def index d4918cdc..2814e66b 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def index 396fd8fb..f8432137 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def index ce41cd0a..c2660d09 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth in kilobits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def index 09d9d1ca..f9459d6a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def index 4e01710d..8edaca26 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def index 623b5387..93e2d7a1 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between HELLO packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def index e2189016..966566a4 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def index 25152314..132c663a 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def index 16c79f7c..acc84ac0 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def index 3c550513..92884596 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def index afa66613..78fd0e10 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index d63c6ad3..c7b1cfe5 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ -c \"key chain pppoe$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def index 2d4451c6..9d147205 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,12 +6,12 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def index 246f1f5c..1ca1dd11 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 7b821eae..76b03e21 100644 --- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def index 601e61d4..d4b4ceaa 100644 --- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: Set to ignore link state changes on this interface -update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +update:vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../@)" \ -c "no link-detect" -delete:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete:vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def index 9f1f2f5c..0d156a55 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def index 6b2a3867..341af509 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def index a55e38b0..95215c89 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def index ffb478a1..309d2f17 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth for specified interface (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def index 62cd74f6..d57876cd 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def index ec2a7881..5e4170cb 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def index 435a82a6..885ccb43 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def index 7284924c..1bce2ca9 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def index 85854b38..347aee8a 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def index 28643e2a..32321e3b 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def index e24c06cd..a325fe38 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def index 8216ab77..2c64ca30 100644 --- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index bc653d00..bcebd5ab 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def index 958ba0ba..e21e5878 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,12 +8,12 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)"; -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "no ip rip authentication mode" \ -c "no ip rip authentication string $VAR(@)"; diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def index bb9c7449..f40e77d1 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 7c761112..f608d9c3 100644 --- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable poison reverse for split-horizon -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def index 36fadfb7..1b70a938 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def index d4918cdc..2814e66b 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def index 396fd8fb..f8432137 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def index ce41cd0a..c2660d09 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth in kilobits/sec syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def index 09d9d1ca..f9459d6a 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def index 4e01710d..8edaca26 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def index 623b5387..93e2d7a1 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between HELLO packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def index e2189016..966566a4 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def index 25152314..132c663a 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def index 16c79f7c..acc84ac0 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def index 3c550513..92884596 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def index afa66613..78fd0e10 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index d63c6ad3..c7b1cfe5 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ -c \"key chain pppoe$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def index 2d4451c6..9d147205 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,12 +6,12 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"ip rip authentication mode text\" \ -c \"ip rip authentication string $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \ -c \"no ip rip authentication mode\" \ -c \"no ip rip authentication string $VAR(@)\"; " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def index 246f1f5c..1ca1dd11 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 7b821eae..76b03e21 100644 --- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface pppoe$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def index 89c27640..250c9a41 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,9 +1,9 @@ help: Set to ignore link state changes on this interface -update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal\" \ +update:vyatta-vtysh -c "configure terminal\" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "no link-detect" -delete:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete:vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index b3148950..54628133 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def index 3014b636..8f0d87de 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 35731281..0f10b991 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def index 2252541c..25ef0e1e 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def index 7b317c47..bf48e818 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def index 323128a5..2ed57960 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def index 7b4d964d..e5a0de68 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def index 36d6cc47..8636b767 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def index d5c3e072..92c0d77d 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def index 1dcd5ed1..01db7f60 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def index 7d37fda1..6b3c8e38 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def index fcf8be3d..cbb93986 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index 0b2114d8..73aa92d2 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index da94d143..acf34ef9 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,13 +8,13 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def index 760395cc..d38e883e 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index adffdae7..24b76c23 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def index 88908e83..cfb7842b 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def index d81c06b3..85a66781 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def index 2b763800..e97a3ec8 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def index e4d5a8a4..3c256074 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def @@ -1,9 +1,9 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: <1-65535> Cost diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def index 8003c5c1..4bff0b1f 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def @@ -1,9 +1,9 @@ type: u32 help: Set interval after which a neighbor is declared dead syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def index b86cf431..6e743064 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def @@ -1,8 +1,8 @@ type: u32 help: Set interval between hello packets syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def index 50452f78..ae2f1153 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,5 +1,5 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +create:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def index 1296ca18..c7fcc7e7 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def @@ -5,11 +5,11 @@ syntax:expression: $VAR(@) in "non-broadcast"; \ allowed:echo non-broadcast -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def index ed1a63ab..c19b3f85 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def @@ -1,8 +1,8 @@ type: u32 help: Set router priority syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: <0-255> Priority diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def index d6741f94..5dac04e1 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def @@ -1,8 +1,8 @@ type: u32 help: Set interval between retransmitting lost link state advertisements syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: <3-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def index d0a5193d..b60ed78f 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def @@ -1,8 +1,8 @@ type: u32 help: Set link state transmit delay syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: <1-65535> Seconds diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index bc653d00..bcebd5ab 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def index 17a99a94..cdc9e54b 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,12 +8,12 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "no ip rip authentication mode" \ -c "no ip rip authentication string $VAR(@)" diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def index f8f93cd7..4989b867 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 80b8a4a3..17438eac 100644 --- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,8 +1,8 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +create:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"ip rip split-horizon poisoned-reverse\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../@)\" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon\" " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def index 9f1f2f5c..0d156a55 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def index 6b2a3867..341af509 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def index 5339e937..034bc793 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def index 13c9791f..279af757 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def index 62cd74f6..d57876cd 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/cost/node.def @@ -1,10 +1,10 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +delete:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def index ec2a7881..5e4170cb 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/dead-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def index 435a82a6..885ccb43 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def index 7284924c..1bce2ca9 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def index 85854b38..347aee8a 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def index 28643e2a..32321e3b 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/priority/node.def @@ -2,10 +2,10 @@ type: u32 help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf priority \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def index e24c06cd..a325fe38 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/retransmit-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def index 8216ab77..2c64ca30 100644 --- a/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/multilink/node.tag/ip/ospf/transmit-delay/node.def @@ -2,10 +2,10 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " comp_help: possible completions: diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index bc653d00..bcebd5ab 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def index 99d59378..efd87425 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,12 +8,12 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "no ip rip authentication mode" \ -c "no ip rip authentication string $VAR(@)" diff --git a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def index 40f89ff9..8fbfb898 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 7323e1ed..cedfa959 100644 --- a/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/multilink/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def index 2bc34032..ed220d3d 100644 --- a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +update: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "no link-detect" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def index 6bb69330..0bf660e1 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +update: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index 67ab8069..c65bc8cb 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def index 7ebefe6d..f4834d9e 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 5527b2a9..220fff21 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def index b906a189..69d9c930 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def index c35677c5..923a7e10 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def index 60a61cf3..d42350f4 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def index b3b92839..49f22b82 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def index 9d6174db..95a7d46e 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def index 4f3e1c00..8a04c078 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def index c6da51d8..c3de8ff8 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def index f0058e07..c3fc9439 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def index c6705de5..ff0464f0 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index f881c441..d55ddbab 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 4a7f96b8..603e66b9 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -6,13 +6,13 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def index b0b1fcd4..4079f73e 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 0bae0b23..49119ec2 100644 --- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def index 768c0eb2..2fc84bdd 100644 --- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/disable-link-detect/node.def @@ -1,6 +1,6 @@ help: ignore link state changes on this interface -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../@)" \ +update: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \ -c "no link-detect" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "interface $VAR(../@)" \ +delete: vyatta-vtysh -c "configure terminal" -c "interface $VAR(../@)" \ -c "link-detect " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def index 6bb69330..0bf660e1 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +update: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index 67ab8069..c65bc8cb 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def index 7ebefe6d..f4834d9e 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 5527b2a9..220fff21 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def index b906a189..69d9c930 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def index c35677c5..923a7e10 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def index 60a61cf3..d42350f4 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def index b3b92839..49f22b82 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def index 9d6174db..95a7d46e 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def index 4f3e1c00..8a04c078 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def index c6da51d8..c3de8ff8 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def index f0058e07..c3fc9439 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def index c6705de5..ff0464f0 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index f881c441..d55ddbab 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index cc83f470..2362bcae 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,13 +8,13 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def index b0b1fcd4..4079f73e 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 0bae0b23..49119ec2 100644 --- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def index 6bb69330..0bf660e1 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def @@ -1,8 +1,8 @@ help: ignore link state changes on this interface -update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +update: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "no link-detect" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +delete: vyatta-vtysh -c "configure terminal" \ -c "interface $VAR(../../../@).$VAR(../@)" \ -c "link-detect" diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def index 67ab8069..c65bc8cb 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@)\"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def index 7ebefe6d..f4834d9e 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def index 5527b2a9..220fff21 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def index b906a189..69d9c930 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def @@ -3,12 +3,12 @@ help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def index c35677c5..923a7e10 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def @@ -2,12 +2,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def index 60a61cf3..d42350f4 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def @@ -3,12 +3,12 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def index b3b92839..49f22b82 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def index 9d6174db..95a7d46e 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def index 4f3e1c00..8a04c078 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf network $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def index c6da51d8..c3de8ff8 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def @@ -3,12 +3,12 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def index f0058e07..c3fc9439 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,12 +3,12 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf retransmit-interval $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def index c6705de5..ff0464f0 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def @@ -3,12 +3,12 @@ help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"ip ospf transmit-delay $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index f881c441..d55ddbab 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,7 +6,7 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"ip rip authentication mode md5 \" \ @@ -16,7 +16,7 @@ update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"key $VAR(../@) \" \ -c \"key-string $VAR(@) \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \ -c \"no ip rip authentication mode md5 \" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def index 1bc3c650..5f9c34cd 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,13 +8,13 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" \ -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \ -c "no ip rip authentication mode" \ diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def index 63dab9e0..3c4def9e 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 0bae0b23..49119ec2 100644 --- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \ -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def index c58b0a12..250f9429 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/key-id/node.def @@ -9,12 +9,12 @@ delete:expression: "touch /tmp/ospf-md5.$PPID" end:expression: "\ if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"no ip ospf message-digest-key $VAR(@) \"; \ rm /tmp/ospf-md5.$PPID; \ else \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ + vyatta-vtysh -c \"configure terminal\" \ -c \"interface $VAR(../../../../../@) \" \ -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \ fi; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def index 5e85d80e..2c96c430 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/md5/node.def @@ -1,11 +1,11 @@ help: Set MD5 key id -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication message-digest \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def index 5339e937..034bc793 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/authentication/plaintext-password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ -c \"ip ospf authentication \" \ -c \"ip ospf authentication-key $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip ospf authentication \" \ diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def index 13c9791f..279af757 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/bandwidth/node.def @@ -2,12 +2,12 @@ type: u32 help: Set bandwidth (kilobits/sec) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \ "Must be between 1-10000000" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"bandwidth $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no bandwidth $VAR(@) \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def index 3dc62f2b..73282e21 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/cost/node.def @@ -1,12 +1,12 @@ type: u32 help: Set interface cost syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf cost $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf cost \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def index dc1bf9db..625d8a04 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/dead-interval/node.def @@ -3,11 +3,11 @@ help: Set interval after which a neighbor is declared dead default: 40 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf dead-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf dead-interval \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def index 435a82a6..885ccb43 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/hello-interval/node.def @@ -2,10 +2,10 @@ type: u32 help: Set interval between hello packets default: 10 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"ip ospf hello-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf hello-interval \"; " comp_help: possible completions: diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def index 7284924c..1bce2ca9 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/mtu-ignore/node.def @@ -1,10 +1,10 @@ help: Disable Maximum Transmission Unit (MTU) mismatch detection -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"ip ospf mtu-ignore\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf mtu-ignore\"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def index 85854b38..347aee8a 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/network/node.def @@ -3,12 +3,12 @@ help: Set network type syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" \ -c \"interface $VAR(../../../@) \" \ -c \"ip ospf network $VAR(@) \"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../@) \" \ -c \"no ip ospf network \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def index 8f276f74..15d48ad2 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/priority/node.def @@ -3,11 +3,11 @@ help: Set router priority default: 1 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf priority $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf priority \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def index de9a7151..fb75fd82 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/retransmit-interval/node.def @@ -3,11 +3,11 @@ help: Set interval between retransmitting lost link state advertisements default: 5 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf retransmit-interval $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf retransmit-interval \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def index bb49108e..f8b80a10 100644 --- a/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/ospf/transmit-delay/node.def @@ -2,11 +2,11 @@ type: u32 help: Set link state transmit delay default: 1 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf transmit-delay $VAR(@)\"; " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"no ip ospf transmit-delay \"; " diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def index bc653d00..bcebd5ab 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/md5/node.tag/password/node.def @@ -6,14 +6,14 @@ syntax:expression: exec " \ exit 1 ; \ fi ; " -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +update:expression: "vyatta-vtysh \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"ip rip authentication mode md5\" \ -c \"ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ -c \"key chain $VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \ -c \"key-string $VAR(@)\" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr \ +delete:expression: "vyatta-vtysh --noerror \ -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \ -c \"no ip rip authentication mode md5\" \ -c \"no ip rip authentication key-chain $VAR(../../../../../@)-rip\" \ diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def index aaaae83e..36a3926c 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/authentication/plaintext-password/node.def @@ -8,12 +8,12 @@ syntax:expression: exec " \ commit:expression: $VAR(../md5/) == "" ; "md5 password already set" -update: ${vyatta_sbindir}/vyatta-vtysh.pl \ +update: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "ip rip authentication mode text" \ -c "ip rip authentication string $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl \ +delete: vyatta-vtysh \ -c "configure terminal" -c "interface $VAR(../../../../@)" \ -c "no ip rip authentication mode" \ -c "no ip rip authentication string $VAR(@)" diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def index 01740cf7..bc32f241 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/disable/node.def @@ -1,10 +1,10 @@ help: Disable split horizon on specified interface -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon \" " diff --git a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def index 60b45d60..fcd7a857 100644 --- a/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def +++ b/templates/interfaces/tunnel/node.tag/ip/rip/split-horizon/poison-reverse/node.def @@ -1,10 +1,10 @@ help: Enable split-horizon with poison reverse -create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +create:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"ip rip split-horizon poisoned-reverse \" " -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ +delete:expression: "vyatta-vtysh \ -c \"configure terminal \" \ -c \"interface $VAR(../../../../@) \" \ -c \"no ip rip split-horizon \" \ |