diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 12:22:23 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 12:22:23 -0700 |
| commit | bf7375668f33050a9b642e54a0266982ef579137 (patch) | |
| tree | 22fc28c11f252c8c278c5f1e5675f07c2c974f85 /templates/interfaces/bridge | |
| parent | c7779f898380ed23f839ebad6ac79edba4d46b35 (diff) | |
| download | vyatta-cfg-quagga-bf7375668f33050a9b642e54a0266982ef579137.tar.gz vyatta-cfg-quagga-bf7375668f33050a9b642e54a0266982ef579137.zip | |
Use val_help: features to format better
Previous change did not format val-help tag correctly
Diffstat (limited to 'templates/interfaces/bridge')
7 files changed, 10 insertions, 10 deletions
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 5208faf8..699554e2 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -17,6 +17,6 @@ delete: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@) fi allowed: echo "dhcp <>" -val_help:<x.x.x.x/x>; IP address and prefix length -val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length -val_help:dhcp; Dynamic Host Configuration Protocol +val_help: ipv4; IP address and prefix length +val_help: ipv6; IPv6 address and prefix length +val_help: dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index 925734a3..c2d9b12f 100644 --- a/templates/interfaces/bridge/node.tag/aging/node.def +++ b/templates/interfaces/bridge/node.tag/aging/node.def @@ -2,7 +2,7 @@ type: u32 help: Interval addresses are retained default: 300 syntax:expression:$VAR(@) <= 60; "Bridge aging time must be between 0 and 60" -val_help:<0-60>; Address aging time for bridge (seconds) +val_help: u32:0-60; Address aging time for bridge (seconds) update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setageing $VAR(../@) 300 diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index b1e244f4..ae9d8390 100644 --- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def +++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def @@ -1,5 +1,5 @@ type: u32 help: Forwarding delay syntax:expression:$VAR(@) <= 60; "Forwarding delay must be between 0 and 60" -val_help:<0-60>; Spanning Tree Protocol forwarding delay in seconds (default 15) +val_help: u32:0-60; Spanning Tree Protocol forwarding delay in seconds (default 15) update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@) diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def index 6dfb3493..beb6e385 100644 --- a/templates/interfaces/bridge/node.tag/hello-time/node.def +++ b/templates/interfaces/bridge/node.tag/hello-time/node.def @@ -2,6 +2,6 @@ type: u32 default: 2 help: Hello packet advertisment interval syntax:expression:$VAR(@) <= 30; "Bridge Hello interval must be between 0 and 30 seconds" -val_help:<0-30>:Spanning Tree Protocol hello advertisement interval (default 2) +val_help: u32:0-30; Spanning Tree Protocol hello advertisement interval (default 2) update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@) delete: /usr/sbin/brctl sethello $VAR(../@) 2 diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index b05ac934..72b3b902 100644 --- a/templates/interfaces/bridge/node.tag/max-age/node.def +++ b/templates/interfaces/bridge/node.tag/max-age/node.def @@ -2,7 +2,7 @@ type: u32 help: Interval at which neighbor bridges are removed default: 20 syntax:expression:$VAR(@) <= 60; "Bridge max aging value must be between 0 and 60" -val_help:<0-60>:Bridge maximum aging time value (default 20) +val_help: u32:0-60; Bridge maximum aging time value (default 20) update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setmaxage $VAR(../@) 20 diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index 8fc0a683..d487ef84 100644 --- a/templates/interfaces/bridge/node.tag/priority/node.def +++ b/templates/interfaces/bridge/node.tag/priority/node.def @@ -2,7 +2,7 @@ type: u32 help: Priority for this bridge default: 0 syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535" -val_help:<0-65535>; Bridge priority (default 0) +val_help: u32:0-65535; Bridge priority (default 0) update: /usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setbridgeprio $VAR(../@) 0 diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def index 5a660574..d24a3261 100644 --- a/templates/interfaces/bridge/node.tag/stp/node.def +++ b/templates/interfaces/bridge/node.tag/stp/node.def @@ -1,8 +1,8 @@ type: bool default: false help: Enable spanning tree protocol -val_help:true:Enable Spanning Tree Protocol -val_help:false:Disable Spanning Tree Protocol (default false) +val_help: true; Enable Spanning Tree Protocol +val_help: false; Disable Spanning Tree Protocol (default) update: if [ "$VAR(@)" == "true" ]; then if [ -z "$VAR(../../forwarding-delay)" ]; then |