summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-04-08 12:06:51 -0700
committerStig Thormodsrud <stig@vyatta.com>2008-04-08 12:06:51 -0700
commit5565a0741a4f74a5c7d4210e877a6b9b61eefaad (patch)
treefd43c4fcfedfb0b0509a5a1184f6f85d33a4a18c
parent3c78e0e972134e39cebe593562b734a438aa18cc (diff)
downloadvyatta-cfg-quagga-5565a0741a4f74a5c7d4210e877a6b9b61eefaad.tar.gz
vyatta-cfg-quagga-5565a0741a4f74a5c7d4210e877a6b9b61eefaad.zip
Fix 3133: "delete protocols ospf timers throttle spf delay" commit failed
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/node.def24
1 files changed, 11 insertions, 13 deletions
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
index d94698ea..9f68167c 100644
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/node.def
@@ -1,14 +1,12 @@
help: OSPF SPF timers
-delete:expression: "touch /tmp/ospf-timer.$PPID"
-end:expression: "\
- if [ -f \"/tmp/ospf-timer.$PPID\" ]; then \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"no timers throttle spf\"; \
- rm /tmp/ospf-timer.$PPID; \
- else \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"timers throttle spf $VAR(delay/@) \
- $VAR(initial-holdtime/@) $VAR(max-holdtime/@)\"; \
- fi; "
+delete: touch /tmp/ospf-timer.$PPID
+end: if [ -f "/tmp/ospf-timer.$PPID" ]; then
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+ -c "router ospf" \
+ -c "no timers throttle spf";
+ rm /tmp/ospf-timer.$PPID;
+ else
+ ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
+ -c "router ospf" \
+ -c "timers throttle spf $VAR(delay/@) $VAR(initial-holdtime/@) $VAR(max-holdtime/@)";
+ fi;