diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-30 15:28:35 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-30 15:28:35 -0700 |
| commit | bb626b99b59133577e333cd2b5553cdc621c4ad7 (patch) | |
| tree | 6b4417b20f57b33c3dae8495d764417c6fa55832 /templates/interfaces/multilink | |
| parent | 88bcee588c999abe4eae6fb12f01a8ca2d929279 (diff) | |
| download | vyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.tar.gz vyatta-cfg-quagga-bb626b99b59133577e333cd2b5553cdc621c4ad7.zip | |
Replace calls to vyatta-vtysh perl script with vyatta-vtysh
No longer need the perl wrapper, the logging and error suppression
are now in the command itself. This helps with the speed of route
creation with lots of routes.
Diffstat (limited to 'templates/interfaces/multilink')
17 files changed, 34 insertions, 34 deletions
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" |