Page MenuHomeFreeBSD
Files F103010866

D40157.diff
No OneTemporary
Actions

D40157.diff
View Options

diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh
--- a/usr.sbin/adduser/adduser.sh
+++ b/usr.sbin/adduser/adduser.sh
@@ -657,6 +657,8 @@
_usepass="yes"
_logingroup_ok="no"
_groups_ok="no"
+ _all_ok="yes"
+ _another_user="no"
case $passwdtype in
none)
_emptypass="yes"
@@ -817,8 +819,11 @@
printf "%-10s : %s\n" "Shell" "$ushell"
printf "%-10s : %s\n" "Locked" "$_disable"
while : ; do
- echo -n "OK? (yes/no): "
+ echo -n "OK? (yes/no) [$_all_ok]: "
read _input
+ if [ -z "$_input" ]; then
+ _input=$_all_ok
+ fi
case $_input in
[Nn][Oo]|[Nn])
return 1
@@ -1030,11 +1035,14 @@
input_interactive
while : ; do
if [ -z "$configflag" ]; then
- echo -n "Add another user? (yes/no): "
+ echo -n "Add another user? (yes/no) [$_another_user]: "
else
- echo -n "Re-edit the default configuration? (yes/no): "
+ echo -n "Re-edit the default configuration? (yes/no) [$_another_user]: "
fi
read _input
+ if [ -z "$_input" ]; then
+ _input=$_another_user
+ fi
case $_input in
[Yy][Ee][Ss]|[Yy][Ee]|[Yy])
uidstart=`get_nextuid $uidstart`

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 7:24 PM (21 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14745577
Default Alt Text
D40157.diff (1 KB)

Event Timeline