summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-02-12 18:30:46 -0800
committerStig Thormodsrud <stig@vyatta.com>2008-02-12 18:30:46 -0800
commitbfc47df97acb41cd4c7acbd7a4b1c46f258acd36 (patch)
tree1f744ce4bf524ec212696eff1d49b78699c7988a
parentbe79857b1dbf5bd9a66e685b6aff8aa1bf778b04 (diff)
downloadvyatta-cfg-quagga-bfc47df97acb41cd4c7acbd7a4b1c46f258acd36.tar.gz
vyatta-cfg-quagga-bfc47df97acb41cd4c7acbd7a4b1c46f258acd36.zip
Fix 2813 'show configuration all' does not display all default
-rw-r--r--templates/protocols/rip/timers/garbage-collection/node.def9
-rw-r--r--templates/protocols/rip/timers/node.def21
-rw-r--r--templates/protocols/rip/timers/timeout/node.def7
-rw-r--r--templates/protocols/rip/timers/update/node.def8
4 files changed, 27 insertions, 18 deletions
diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def
index c30b35e4..2a7b2bc9 100644
--- a/templates/protocols/rip/timers/garbage-collection/node.def
+++ b/templates/protocols/rip/timers/garbage-collection/node.def
@@ -1,6 +1,7 @@
type: u32
default: 120
-help: Garbage collection timer. Default is 120.
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Garbage collection timer must be between 5 and 2147483647"
-
-
+help: Garbage collection timer
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
+ "Garbage collection timer must be between 5 and 2147483647"
+comp_help: possible completions:
+ <5-2147483647> Garbage colletion time (default 120)
diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def
index 94a46fb6..c1a16c29 100644
--- a/templates/protocols/rip/timers/node.def
+++ b/templates/protocols/rip/timers/node.def
@@ -1,11 +1,14 @@
help: Set RIP timer values
delete:expression: "touch /tmp/rip-timers.$PPID"
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
- -c \"no timers basic\"; \
- if [ -f \"/tmp/rip-timers.$PPID\" ]; then \
- rm -rf /tmp/rip-timers.$PPID; \
- else \
- ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
- -c \"timers basic $VAR(./update/@) $VAR(./timeout/@) $VAR(./garbage-collection/@)\"; \
- fi; "
-
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
+ -c \"configure terminal\" -c \"router rip\" \
+ -c \"no timers basic\"; \
+ if [ -f \"/tmp/rip-timers.$PPID\" ]; then \
+ rm -rf /tmp/rip-timers.$PPID; \
+ else \
+ ${vyatta_sbindir}/vyatta-vtysh.pl \
+ -c \"configure terminal\" -c \"router rip\" \
+ -c \"timers basic $VAR(./update/@) \
+ $VAR(./timeout/@) \
+ $VAR(./garbage-collection/@)\"; \
+ fi; "
diff --git a/templates/protocols/rip/timers/timeout/node.def b/templates/protocols/rip/timers/timeout/node.def
index cc7f2fe5..907662f0 100644
--- a/templates/protocols/rip/timers/timeout/node.def
+++ b/templates/protocols/rip/timers/timeout/node.def
@@ -1,4 +1,7 @@
type: u32
default: 180
-help: Routing information timeout timer. Default is 180.
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Timeout timer must be between 5 and 2147483647"
+help: Routing information timeout timer
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
+ "Timeout timer must be between 5 and 2147483647"
+comp_help: possible completions:
+ <5-2147483647> Routing information timeout timer (default 180)
diff --git a/templates/protocols/rip/timers/update/node.def b/templates/protocols/rip/timers/update/node.def
index 24d6bc09..6a48225f 100644
--- a/templates/protocols/rip/timers/update/node.def
+++ b/templates/protocols/rip/timers/update/node.def
@@ -1,5 +1,7 @@
type: u32
default: 30
-help: Routing table update timer in seconds. Default is 30.
-syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; "Update timer must be between 5 and 2147483647"
-
+help: Routing table update timer
+syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
+ "Update timer must be between 5 and 2147483647"
+comp_help: possible completions:
+ <5-2147483647> Routing table update timer in seconds (default 30)