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/system/login | |
| 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/system/login')
3 files changed, 7 insertions, 5 deletions
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def index d30d5afb..d4670e39 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def @@ -1,7 +1,7 @@ tag: type: txt help: Remote access public keys -val_help:<txt>; key identifier used by ssh-keygen (usually of form user@host) +val_help: key identifier used by ssh-keygen (usually of form user@host) commit:expression: $VAR(./type/) != "" ; \ "Must configure public key type for $VAR(@)" diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def index 2dc0abc9..f706521a 100644 --- a/templates/system/login/user/node.tag/group/node.def +++ b/templates/system/login/user/node.tag/group/node.def @@ -1,6 +1,9 @@ multi: type: txt help: Additional group membership +val_help: <groupname>; Group name +val_help: u32:0-65535; Group ID + syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$" ; "Invalid group name $VAR(@)" syntax:expression: ! $VAR(@) in \ @@ -10,4 +13,3 @@ allowed: awk -F: ' $1 == "quaggavty" || $1 == "vyattacfg" || $1 == "vyattaop" || \ $1 == "sudo" || $1 == "adm" || $1 == "operator" { next; } {printf "%s ", $1}' </etc/group -comp_help: Enter group name or numerical group id diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def index 2596bd7a..54891031 100644 --- a/templates/system/login/user/node.tag/level/node.def +++ b/templates/system/login/user/node.tag/level/node.def @@ -2,6 +2,6 @@ type: txt help: User privilege level default: "admin" syntax:expression: $VAR(@) in "admin", "operator"; "Allowed levels are \"admin\" and \"operator\"" -comp_help:Possible completions: - admin Administrators - operator Operators + +val_help: admin; Administrators +val_help: operator; Operators |