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/protocols/ospf/redistribute | |
| 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/protocols/ospf/redistribute')
5 files changed, 10 insertions, 10 deletions
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index 6e1eb3b4..a3e04d6d 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -1,6 +1,6 @@ help: Set to redistribute BGP routes delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +end: vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute bgp"; if [ -f "/tmp/ospf-redist-bgp.$PPID" ]; then @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then COND="$COND route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "redistribute bgp $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index e9b1582a..be4f6d0e 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -1,6 +1,6 @@ help: Set to redistribute connected routes delete:expression: "touch /tmp/ospf-redist-connected.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +end: vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute connected"; if [ -f "/tmp/ospf-redist-connected.$PPID" ]; then @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then COND="$COND route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "redistribute connected $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index b6b086ae..20669be7 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -1,6 +1,6 @@ help: Set to redistribute kernel routes delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ +end: vyatta-vtysh -c \"configure terminal\" \ -c "router ospf" \ -c "no redistribute kernel"; if [ -f "/tmp/ospf-redist-kernel.$PPID" ]; then @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ if [ -n "$VAR(./route-map/@)" ]; then COND="$COND route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "redistribute kernel $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index b04a3a13..6d29347b 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -1,6 +1,6 @@ help: Set to redistribute RIP routes delete:expression: "touch /tmp/ospf-redist-rip.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +end: vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute rip"; if [ -f "/tmp/ospf-redist-rip.$PPID" ]; then @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then COND="$COND route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "redistribute rip $COND"; fi; diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index 7b687ca2..4e748859 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -1,6 +1,6 @@ help: Set to redistribute static routes delete:expression: "touch /tmp/ospf-redist-static.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ +end: vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "no redistribute static"; if [ -f "/tmp/ospf-redist-static.$PPID" ]; then @@ -15,7 +15,7 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./route-map/@)" ]; then COND="$COND route-map $VAR(./route-map/@)"; fi; - ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + vyatta-vtysh -c "configure terminal" \ -c "router ospf" \ -c "redistribute static $COND"; fi; |