diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 10:34:20 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 10:34:20 -0700 |
| commit | 49170f6676d2779a38bbaff61ba27f1ccaa5b444 (patch) | |
| tree | 78b5da8df16d7888a0f2c8fee62c7f503c039e33 /templates/interfaces | |
| parent | 12c2160ecbf2ff6b441ec9f4cc5e70273c44b556 (diff) | |
| download | vyatta-cfg-system-49170f6676d2779a38bbaff61ba27f1ccaa5b444.tar.gz vyatta-cfg-system-49170f6676d2779a38bbaff61ba27f1ccaa5b444.zip | |
Use val_help: for Ethernet interface parameters
More consistency fixes.
Diffstat (limited to 'templates/interfaces')
4 files changed, 14 insertions, 17 deletions
diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def index c4419a2c..a032266d 100644 --- a/templates/interfaces/ethernet/node.tag/duplex/node.def +++ b/templates/interfaces/ethernet/node.tag/duplex/node.def @@ -2,12 +2,12 @@ type: txt help: Duplex mode default: "auto" syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full" +val_help:auto:Auto negotiation (default) +val_help:half:Half duplex +val_help:full:Full duplex + commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \ ( $VAR(@) != "auto" && $VAR(../speed/@) != "auto" ) ; \ "if duplex is hardcoded, speed must also be hardcoded" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \ --speed-duplex $VAR(../speed/@) $VAR(@) -comp_help:Possible completions: - auto\t\tAuto negotiation (default) - half\t\tHalf duplex - full\t\tFull duplex diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def index ae1e3da7..b1c33b6b 100644 --- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def +++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def @@ -15,9 +15,8 @@ type: txt help: CPU interrupt affinity mask -comp_help: Possible completions: - XX\tHexidecimal bitmask representing CPUs that this NIC will interrupt - auto\tSet affinity automatically +val_help:<hex number>:Bitmask representing CPUs that this NIC will interrupt +val_help:auto:affinity automatically (default) default: "auto" diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def index 932c88e5..5d68f524 100644 --- a/templates/interfaces/ethernet/node.tag/speed/node.def +++ b/templates/interfaces/ethernet/node.tag/speed/node.def @@ -2,15 +2,15 @@ type: txt help: Link speed default: "auto" syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000" +val_help:auto:Auto negotiation (default) +val_help:10:10 Mbit/sec +val_help:100:100 Mbit/sec +val_help:1000:1 Gbit/sec +val_help:2500:2.5 Gbit/sec +val_help:10000:10 Gbit/sec + commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \ ( $VAR(@) != "auto" && $VAR(../duplex/@) != "auto" ) ; \ "if speed is hardcoded, duplex must also be hardcoded" update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \ --speed-duplex $VAR(@) $VAR(../duplex/@) -comp_help:Possible completions: - auto\t\tAuto negotiation (default) - 10 \t\t10 Mbit/sec - 100 \t\t100 Mbit/sec - 1000\t\t1 Gbit/sec - 2500\t\t2.5 Gbit/sec - 10000\t10 Gbit/sec diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index 1ad32323..0076668e 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -2,8 +2,8 @@ tag: priority: 319 type: u32 help: Virtual Local Area Network (VLAN) ID - syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" +val_help:<0-4094>:VLAN ID create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) then echo "Error creating VLAN device $VAR(../@).$VAR(@)" @@ -17,5 +17,3 @@ create: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0 ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) -comp_help: possible completions: - <0-4094> Set VLAN ID |