diff options
| author |   Mike Makonnen <mtm@FreeBSD.org> | 2003-03-19 08:07:15 +0000 |
|---|---|---|
| committer | Mike Makonnen <mtm@FreeBSD.org> | 2003-03-19 08:07:15 +0000 |
| commit | e5f96223fdef6911fdc8c7324635681d33f14049 (patch) | |
| tree | 03436fb1770051536d3c97229ee637eb520be496 /adduser/adduser.sh | |
| parent | 169a7d34d53c0da1ef60b70fd97982f42a9556ba (diff) | |
| download | pw-darwin-e5f96223fdef6911fdc8c7324635681d33f14049.tar.gz pw-darwin-e5f96223fdef6911fdc8c7324635681d33f14049.tar.zst pw-darwin-e5f96223fdef6911fdc8c7324635681d33f14049.zip | |
o initialize a couple of local flags so the user can re-edit groups
next time the subroutine is re-entered
o s/configrun/configflag/
o Make the prompt make sense if the user was creating a configuration file
Approved by: markm (mentor)(implicit)
Diffstat (limited to 'adduser/adduser.sh')
| -rw-r--r-- | adduser/adduser.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/adduser/adduser.sh b/adduser/adduser.sh index 3b843c6..79e3752 100644 --- a/adduser/adduser.sh +++ b/adduser/adduser.sh @@ -558,6 +558,8 @@ input_interactive() { _random="no" _emptypass="no" _usepass="yes" + _logingroup_ok="no" + _groups_ok="no" case $passwdtype in none) _emptypass="yes" @@ -629,7 +631,7 @@ input_interactive() { ;; esac passwdtype="yes" - [ -n "$configrun" ] && break + [ -n "$configflag" ] && break trap 'stty echo; exit' 0 1 2 3 15 stty -echo echo -n "Enter password: " @@ -904,7 +906,11 @@ if [ -n "$fflag" ]; then else input_interactive while : ; do - echo -n "Add another user? (yes/no): " + if [ -z "$configflag" ]; then + echo -n "Add another user? (yes/no): " + else + echo -n "Re-edit the default configuration? (yes/no): " + fi read _input case $_input in [Yy][Ee][Ss]|[Yy][Ee]|[Yy]) |