diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2008-06-11 10:54:06 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2008-06-11 10:54:06 -0700 |
| commit | 85eb0bea9c6639a6bbc36bb80bb488f8cc24b2a7 (patch) | |
| tree | 2b8ea26c871955525006e9d0a0eefcebb7b772c9 | |
| parent | 8d899684fa07fc5301e39848facf6fa11933b949 (diff) | |
| download | vyatta-cfg-quagga-85eb0bea9c6639a6bbc36bb80bb488f8cc24b2a7.tar.gz vyatta-cfg-quagga-85eb0bea9c6639a6bbc36bb80bb488f8cc24b2a7.zip | |
Fix 3345: Unable to configure OSPF redistribute <protocol> route-map <name>
5 files changed, 15 insertions, 15 deletions
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index a997d42b..6e1eb3b4 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -9,12 +9,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./metric/@)" ]; then COND="metric $VAR(./metric/@)"; fi; - if [ -n "$VAR(./route-map/@)" ]; then - COND="$COND route-map $VAR(./route-map/@)"; - fi; if [ -n "$VAR(./metric-type/@)" ]; then COND="$COND metric-type $VAR(./metric-type/@)"; fi; + if [ -n "$VAR(./route-map/@)" ]; then + COND="$COND route-map $VAR(./route-map/@)"; + fi; ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "router ospf" \ -c "redistribute bgp $COND"; diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index ac4f0e00..e9b1582a 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -9,12 +9,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./metric/@)" ]; then COND="metric $VAR(./metric/@)"; fi; - if [ -n "$VAR(./route-map/@)" ]; then - COND="$COND route-map $VAR(./route-map/@)"; - fi; if [ -n "$VAR(./metric-type/@)" ]; then COND="$COND metric-type $VAR(./metric-type/@)"; fi; + if [ -n "$VAR(./route-map/@)" ]; then + COND="$COND route-map $VAR(./route-map/@)"; + fi; ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "router ospf" \ -c "redistribute connected $COND"; diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index b4233bc0..b6b086ae 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -9,12 +9,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ if [ -n "$VAR(./metric/@)" ]; then COND="metric $VAR(./metric/@)"; fi; - if [ -n "$VAR(./route-map/@)" ]; then - COND="$COND route-map $VAR(./route-map/@)"; - fi; if [ -n "$VAR(./metric-type/@)" ]; then COND="$COND metric-type $VAR(./metric-type/@)"; fi; + if [ -n "$VAR(./route-map/@)" ]; then + COND="$COND route-map $VAR(./route-map/@)"; + fi; ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "router ospf" \ -c "redistribute kernel $COND"; diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index 4382e22f..b04a3a13 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -9,12 +9,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./metric/@)" ]; then COND="metric $VAR(./metric/@)"; fi; - if [ -n "$VAR(./route-map/@)" ]; then - COND="$COND route-map $VAR(./route-map/@)"; - fi; if [ -n "$VAR(./metric-type/@)" ]; then COND="$COND metric-type $VAR(./metric-type/@)"; fi; + if [ -n "$VAR(./route-map/@)" ]; then + COND="$COND route-map $VAR(./route-map/@)"; + fi; ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "router ospf" \ -c "redistribute rip $COND"; diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index 17e46d0e..7b687ca2 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -9,12 +9,12 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ if [ -n "$VAR(./metric/@)" ]; then COND="metric $VAR(./metric/@)"; fi; - if [ -n "$VAR(./route-map/@)" ]; then - COND="$COND route-map $VAR(./route-map/@)"; - fi; if [ -n "$VAR(./metric-type/@)" ]; then COND="$COND metric-type $VAR(./metric-type/@)"; fi; + if [ -n "$VAR(./route-map/@)" ]; then + COND="$COND route-map $VAR(./route-map/@)"; + fi; ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ -c "router ospf" \ -c "redistribute static $COND"; |