From nobody Fri Feb 6 00:32:52 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f6Zn05Dclz6RS5H for ; Fri, 06 Feb 2026 00:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Zn04Vxgz457H for ; Fri, 06 Feb 2026 00:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770337972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfS9pD6nwiMTPmF3aoTMSI6to2ktHFcewmHAWpn6uVU=; b=CcgIxEX0oCBnQtg/wy9woXswqN8H7doHt+t98cj38N3mQjt5UqPFRC6JUKkxBY7hhRqRx/ IQt0s9ni0hz3hBZXUIZb2+C91anCmuzJ0+65uv50LHX0LReEmgSYWjnLRKFqSGvHBsaza7 BjOkcGrWKrpHfm2KRDSE8RG9UpFUd4xIPjHzUr2l9opfNvYpijgQYkR5gzFNqOu8l6ZSdK ZgGkqVLHtT87QUJkGwUZtH+ZjSxamkkl3U9f58vHT3IYc5a/xH0rpmpW/ZXj/xzWQo44qH Hwic8CurHasndwEXCfNkC64uh/iPi+h8/B4brBVGy4SMINO8a9PJ4C8HTMd2Ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770337972; a=rsa-sha256; cv=none; b=pJDc9l8cuGvgpE1Lf0zG9C1rA31+hn4ZNEP3s3GDiaBQxL/yHhZNrEguynAfqM7EqjD+ZL 6iPSjtLvlVRZSyB3u9Y7QKicoAHsfpOaSJSLPurcugOlGblakX7VrNgYrja8mLKFPgZvXp jDbzO5asezLcM/O+ZHQeTf1uFSWY+OaoVUe6qCuWZrjwqav2PmKUbgewGQzZxTaWHEjPVB 8yyi+oI1hL4fh4X7T1tDgR+Hb/YhmUZICQvYydW01afmPTrsO8r/JXBb7e9hRpYzWdIwS8 5cQsNhnopQFZYsj/QgEymITHIARKQqI//XqKlWGyc7d1E3KUlmWy9IywXTN5GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770337972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tfS9pD6nwiMTPmF3aoTMSI6to2ktHFcewmHAWpn6uVU=; b=t272bHEzEKYb3RS6UqWCpMX+Opnr2M4kOpoCLP0iH8jkdaMHAXUdQTaDRYvSI2GNas1PHA ezfzyctXT3uPZZ8JdKcpa5hF+so9MBZSd3RIBEJwkPKiu6lDqAM25tLNGFuWt91L6SiYMr GOfwGJ9v/LDMrqu9gjqkEd68qOMIwdYyIgXQpTV3EhXXQOsdRZvV+zf92mMAu6kQaee+Gj Xo8TyaBewN6nwRBsHWiVpNUtxiSNHfHM9HKARxiRQjrB++Iw0XUulMEmuWsM7WyWgE61XB wpH2+YGXlWkC+e4MSRfr8fDSc5QQ83B2+bpEsCGFP+trDrgCYK6CDXhjf6AcDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Zn043rgzt43 for ; Fri, 06 Feb 2026 00:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33281 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 00:32:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 090fd9fd3975 - stable/14 - rmuser.sh: Improve prompt consistency with adduser List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 090fd9fd3975fc7b1ff97ebd3caf2a21683fb877 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 00:32:52 +0000 Message-Id: <698536b4.33281.21552791@gitrepo.freebsd.org> The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=090fd9fd3975fc7b1ff97ebd3caf2a21683fb877 commit 090fd9fd3975fc7b1ff97ebd3caf2a21683fb877 Author: Alexander Ziaee AuthorDate: 2025-09-09 17:06:29 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-06 00:32:44 +0000 rmuser.sh: Improve prompt consistency with adduser While here, improve userlist error message. PR: 289399 MFC after: 3 days Reviewed by: kbowling, rgrimes Approved by: kbowling, rgrimes (src) Reported by: michaeldexter, rgrimes Differential Revision: https://reviews.freebsd.org/D52464 (cherry picked from commit fc68f8aac623b5494484adfa41ac600415609870) --- usr.sbin/adduser/rmuser.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/adduser/rmuser.sh b/usr.sbin/adduser/rmuser.sh index 4c1e4049763a..8e5dd28cf01f 100644 --- a/usr.sbin/adduser/rmuser.sh +++ b/usr.sbin/adduser/rmuser.sh @@ -303,7 +303,7 @@ if [ ! "$userlist" ]; then show_usage exit 1 else - echo -n "Please enter one or more usernames: " + echo -n "Please enter one or more usernames, or press enter to exit: " read userlist fi fi @@ -333,11 +333,11 @@ for _user in $userlist ; do echo echo $userrec echo - if ! prompt_yesno "Is this the entry you wish to remove? " ; then + if ! prompt_yesno "Is this the entry you wish to remove? (yes/no): " ; then continue fi _homedir=`echo $userrec | awk -F: '{print $9}'` - if prompt_yesno "Remove user's home directory ($_homedir)? "; then + if prompt_yesno "Remove user's home directory? [$_homedir] (yes/no): "; then pw_rswitch="-r" fi else