The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=15a1ba4a1c467a686573158fd5e49abafa42d587
commit 15a1ba4a1c467a686573158fd5e49abafa42d587 Author: Benedict Reuschling <[email protected]> AuthorDate: 2026-06-23 13:13:44 +0000 Commit: Benedict Reuschling <[email protected]> CommitDate: 2026-06-23 13:13:44 +0000 adduser.sh: Add info which separator to use in the question itself During the non-root user setup (adduser.sh), people are often confused what the separator is when they are asked which groups to join the new user into. For example, wheel and operator: users often assume that the two groups are separated by a comma (and maybe even a space after it), but the script will check for that and refuses such entries. Help the users by mentioning that the groups need to be space separated in the question itself. That way, it does not take up extra space and avoids confusion about what the separator is. Reviewed by: jrm Event: Halifax Hackathon 202626 Differential Revision: https://reviews.freebsd.org/D57768 --- usr.sbin/adduser/adduser.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/adduser/adduser.sh b/usr.sbin/adduser/adduser.sh index ecac7478befd..94a59830c21e 100644 --- a/usr.sbin/adduser/adduser.sh +++ b/usr.sbin/adduser/adduser.sh @@ -574,7 +574,7 @@ get_groups() { if [ -z "$configflag" ]; then [ -z "$fflag" ] && echo -n "Login group is $_group. Invite $username" - [ -z "$fflag" ] && echo -n " into other groups? [$ugroups]: " + [ -z "$fflag" ] && echo -n " into other (space separated) groups? [$ugroups]: " else [ -z "$fflag" ] && echo -n "Enter additional groups [$ugroups]: " fi @@ -1018,7 +1018,7 @@ for _i in $* ; do done if [ -n "$readconfig" ] && [ -r "${ADDUSERCONF}" ]; then . "${ADDUSERCONF}" -fi +fi # Process command-line options #
