diff options
| author | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-12-05 09:56:10 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-12-05 09:56:10 -0800 |
| commit | 8b00422b60deb69fa9abbfe584e69b5853c5e8af (patch) | |
| tree | 47eb6ae79dc0f7084a2723c32e863980f943d928 /templates/system | |
| parent | e68b9e536f618582774313c04fc53ad4f6eb4ab1 (diff) | |
| parent | a42b9776af35929a1de00940fdf24337b028230e (diff) | |
| download | vyatta-cfg-system-8b00422b60deb69fa9abbfe584e69b5853c5e8af.tar.gz vyatta-cfg-system-8b00422b60deb69fa9abbfe584e69b5853c5e8af.zip | |
Merge branch 'master' into glendale
Diffstat (limited to 'templates/system')
| -rw-r--r-- | templates/system/login/user/node.def | 2 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/level/node.def (renamed from templates/system/login/user/node.tag/group/node.def) | 4 | ||||
| -rw-r--r-- | templates/system/name-server/node.def | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index fbac0c54..d05ac373 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -9,7 +9,7 @@ then rm -rf /tmp/vyatta-delete-system-login-user-$(@).\\\$PPID && exit 0; \ fi && \ sudo /opt/vyatta/sbin/vyatta_update_login_user.pl \ '$(@)' '$(full-name/@)' '$(authentication/encrypted-password/@)' \ - '$(group/@)'" + '$(level/@)'" delete: "if [ x$(@) == x ]; then exit 1; fi && \ if [ x$(@) == xroot ]; then \ echo Cannot delete user \"root\" 1>&2 && exit 2; \ diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/level/node.def index 17739351..30ac731c 100644 --- a/templates/system/login/user/node.tag/group/node.def +++ b/templates/system/login/user/node.tag/level/node.def @@ -1,7 +1,7 @@ type: txt -help: "User group" +help: "User privilege level" default: "admin" -syntax: $(@) in "admin", "users"; "Users can only be in group \"admin\" or \"users\"" +syntax: $(@) in "admin", "users"; "Allowed levels are \"admin\" and \"users\"" #comp_help:Possible completions: # admin\t\tAdministrators # users\t\tNormal users diff --git a/templates/system/name-server/node.def b/templates/system/name-server/node.def index ff6ddf2e..fe2bcb02 100644 --- a/templates/system/name-server/node.def +++ b/templates/system/name-server/node.def @@ -8,10 +8,10 @@ else \ echo \\\"nameserver\t $(@)\\\" >> /etc/resolv.conf; \ fi && \ if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then \ - /usr/sbin/invoke-rc.d ntp restart; \ + /usr/sbin/invoke-rc.d ntp restart >&/dev/null; \ fi\" " delete: "sudo sh -c \"touch /etc/resolv.conf && \ sed -i '/$(@)/d' /etc/resolv.conf && \ if [ -f /etc/ntp.conf ] && grep -q 'server' /etc/ntp.conf; then \ - /usr/sbin/invoke-rc.d ntp restart; \ + /usr/sbin/invoke-rc.d ntp restart >&/dev/null; \ fi\" " |