diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2008-04-07 14:33:51 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2008-04-07 14:33:51 -0700 |
| commit | 15652edefb61bdf6ec2a8f04f7a23784ecbd3c5b (patch) | |
| tree | 230a992fab09c81fbd17332f05b0807e8a497209 | |
| parent | d10532d1511af38b0c9cbba0ed8867a489fe966a (diff) | |
| download | vyatta-cfg-quagga-15652edefb61bdf6ec2a8f04f7a23784ecbd3c5b.tar.gz vyatta-cfg-quagga-15652edefb61bdf6ec2a8f04f7a23784ecbd3c5b.zip | |
Fix 3115: set protocols ospf default-information originate always" sends no "always" to the
routing engine
| -rw-r--r-- | templates/protocols/ospf/default-information/originate/node.def | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def index 540b39bd..084d529e 100644 --- a/templates/protocols/ospf/default-information/originate/node.def +++ b/templates/protocols/ospf/default-information/originate/node.def @@ -1,24 +1,30 @@ help: Distribute a default route -delete:expression: "touch /tmp/ospf-default-info.$PPID" -end:expression: "\ - if [ -f \"/tmp/ospf-default-info.$PPID\" ]; then \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"no default-information originate \"; \ - else \ - if [ -n \"$VAR(./always/@)\" ]; then \ - PARM=\"always\"; \ - fi; \ - if [ -n \"$VAR(./metric/@)\" ]; then \ - PARM=\"$PARM metric $VAR(./metric/@)\"; \ - fi; \ - if [ -n \"$VAR(./metric-type/@)\" ]; then \ - PARM=\"$PARM metric-type $VAR(./metric-type/@)\"; \ - fi; \ - if [ -n \"$VAR(./route-map/@)\" ]; then \ - PARM=\"$PARM route-map $VAR(./route-map/@)\"; \ - fi; \ - ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"default-information originate $PARM\"; \ - fi; " +delete: touch /tmp/ospf-default-info.$PPID +end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then + ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + -c "router ospf" \ + -c "no default-information originate"; + else + # uncomment and remove script pending bug 2525 + # + # if [ -n "$VAR(./always/)" ]; then + # PARM="always"; + # fi; + ${vyatta_sbindir}/vyatta-check-typeless-node.pl \ + "protocols ospf default-information originate always"; + if [ $? -eq 0 ] ; then + PARM="always"; + fi; + if [ -n "$VAR(./metric/@)" ]; then + PARM="$PARM metric $VAR(./metric/@)"; + fi; + if [ -n "$VAR(./metric-type/@)" ]; then + PARM="$PARM metric-type $VAR(./metric-type/@)"; + fi; + if [ -n "$VAR(./route-map/@)" ]; then + PARM="$PARM route-map $VAR(./route-map/@)"; + fi; + ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + -c "router ospf" \ + -c "default-information originate $PARM"; + fi; |