From nobody Wed Mar 26 21:26:27 2025 X-Original-To: dev-commits-src-branches@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 4ZNKbl4t9sz5rDRL; Wed, 26 Mar 2025 21:26:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNKbl4100z40tY; Wed, 26 Mar 2025 21:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743024387; 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=fomPh70ckug9pVyjiKayiivc7teFza1AoSpGviKoJnU=; b=g33VqA/kfCuKP4w6Fk2y12eHBbnTZLNdT3e7WdGfuH/g0ZXlHElsrbDtEQHqN49AOj9kzs ivFFKYJ11DNG/VokPBlXmonvwLZQgmJk8R3HYG6klxBHkkehlqeNEAkQ8i3en+T/5CNvOv siMByF6e0KkWnDSrSCI6dvtLhV3eLOAjNgnd3BiBd2DZbvxtV+Wyvu8st+IqJ28HjP8KCu zCRTO/+fzlvLCCp8diMGbIscR+Ffb1NF2iiRHbpZrHvIk55g4LWGg22DJY+ugDT3ijSj5g 89qOR9ZSM8YmdWclpVg5XGIGpz+nFpXhkG2Am02cVppkOsUpgljU6XfmkzZxWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743024387; a=rsa-sha256; cv=none; b=GzUAkhwgxnGkbRp8Yir+/SXm4inNYD8xlYVKBFHMjn7YUP2DCzPVWiPwoICMVNmSCrQw7v 7N0/6gYnKEK9JIv75yvUfzZqcTzKKNHQAU4xlEUkehooO9ifeVXTlrJvpq7ZfgeJZbw+o3 m6uc7FmyOxAOqxT1iVSl2aoQeM4DNfv1bh1c46wMseVZ84keZEfvT7wtfvQgxSqNtiQlPD z9ApesiV88oPcXlkxtvSErf9VXdoFFsVdG3A0jyNS45tB6ojQ4Zia+nXGb7DMMFgtacMXL hPPfm8F12w9hcxrzYCxmuNB6yrajpRMzAb5WUk/IByCpgox+nsgACmwxjzf/sA== 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=1743024387; 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=fomPh70ckug9pVyjiKayiivc7teFza1AoSpGviKoJnU=; b=F+1ck92s2zIXV+KhKf6MlFfTlWMw+HwQ+EH/sPfPfmVjye8/aRXkITVi+12IxuQ9k9ATVn Ym2K89uLpUEYNdiAfH4GEL8reO7HP1kLLZLnSfnFtVNu7/Uem7hsJEMM/GNV6r7ai6u9Zs fIRARKLq7yCvYhs0JdlnjzNzNll8islF6yMsBpbTQ+zYfSEQCvBaASuIcDfoXO8JMMYcr4 eLAjWhoc4JI3qhyAdGXdwYhilhr4xhttckeNIm8S/wBqGRzBcRpkqSNAxT9LcVlauPUE4m k55mYPtSpmcVpnj26AF4yG6nkHwW5/wHcZqy1LG5Z7xHkZCPFNMO/5JU169ZcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZNKbl3blPzCHK; Wed, 26 Mar 2025 21:26:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52QLQRNC089985; Wed, 26 Mar 2025 21:26:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QLQRPE089982; Wed, 26 Mar 2025 21:26:27 GMT (envelope-from git) Date: Wed, 26 Mar 2025 21:26:27 GMT Message-Id: <202503262126.52QLQRPE089982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: d5425ed751aa - stable/13 - mptutil: document that disabled/enabled are also supported List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d5425ed751aa89c8bedaf7a84c3cae2bfd195247 Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d5425ed751aa89c8bedaf7a84c3cae2bfd195247 commit d5425ed751aa89c8bedaf7a84c3cae2bfd195247 Author: Enji Cooper AuthorDate: 2023-05-25 04:54:02 +0000 Commit: Enji Cooper CommitDate: 2025-03-26 21:26:13 +0000 mptutil: document that disabled/enabled are also supported This change officially documents the fact that the `volume cache enabled` and `volume cache disabled` are also supported. While here, remove an unnecessary newline at the end of a warn*(3) call. warn*(3) adds a newline automatically. MFC after: 1 week (cherry picked from commit 9a49a3792940497ddf4657f6e5be56d8ef881edc) --- usr.sbin/mptutil/mpt_volume.c | 3 ++- usr.sbin/mptutil/mptutil.8 | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c index aa28262e3709..73137f647157 100644 --- a/usr.sbin/mptutil/mpt_volume.c +++ b/usr.sbin/mptutil/mpt_volume.c @@ -217,7 +217,8 @@ volume_cache(int ac, char **av) *s1 = tolower(*s1); if ((strcmp(av[2], "enable")) && (strcmp(av[2], "enabled")) && (strcmp(av[2], "disable")) && (strcmp(av[2], "disabled"))) { - warnx("volume cache: invalid flag, must be 'enable' or 'disable'\n"); + warnx("volume cache: invalid flag; " + "must be 'enable', 'enabled', 'disable', or 'disabled'"); return (EINVAL); } diff --git a/usr.sbin/mptutil/mptutil.8 b/usr.sbin/mptutil/mptutil.8 index 74fbda13ba2e..88c5d4505e8e 100644 --- a/usr.sbin/mptutil/mptutil.8 +++ b/usr.sbin/mptutil/mptutil.8 @@ -27,7 +27,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 16, 2009 +.Dd May 24, 2024 +.\" .Dt MPTUTIL 8 .Os .Sh NAME @@ -69,7 +70,7 @@ .Nm .Op Fl u Ar unit .Cm volume cache Ar volume -.Ar enable|disable +.Ar enable|enabled|disable|disabled .Nm .Op Fl u Ar unit .Cm clear @@ -237,7 +238,7 @@ Sets the name of .Ar volume to .Ar name . -.It Cm volume cache Ar volume Ar enable|disable +.It Cm volume cache Ar volume Ar enable|enabled|disable|disabled Enables or disables the drive write cache for the member drives of .Ar volume . .It Cm volume status Ar volume