From nobody Sat Jan 25 12:00:01 2025 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 4YgCst0FKfz5lDNp; Sat, 25 Jan 2025 12:00:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgCss59JQz3mr1; Sat, 25 Jan 2025 12:00:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737806401; 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=RD0jZNuDjp2Q2EsTmMQNxF5TnsnoF/A6xaw5ZkdplJM=; b=Q3+1BomkSZaytpyCUNtHg1dVPUIVjs4DNCn8xX7b8RFtLENK0ouSErjVBhQ5FrPsVimcHV zigD6g9CIkZJf/JxozWdOFAEo7hPF/D8qLT9QNtKXdXZfQDBouH6Swff+MRSDbQGxaSjQR KNJ4bYL1X/POx8GoMUwsYdW2x4VZYt+65lxosZLJSwowyCk3BeQ6pdDHwDxLmzvcyoCmmX 9EEc+db4JzKzku0zgANHhF8ogkyHrBnGex93Z3sGMAA06xE+RHrWgCTY3UnIxWTjQO7k8I j0yP8qV9kWonr/sbWkVFOMXuURpaEZ8PJIgw7pbbncXR7R0YuePQKKaFFtQXBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737806401; 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=RD0jZNuDjp2Q2EsTmMQNxF5TnsnoF/A6xaw5ZkdplJM=; b=QHAMqdEiB8CRHRBHZw3B/xz7jmi/STgJUz6Oxhffcp4x1Ko+k2OQoqvWRrIR3GCBxEOvGD BnTKazjNc9k5Zbtx2Q6nEmKuba9VMbC49gYhdTRgc5cC8WRtVmBJjK73e67M/vgtG8O+qa TxmDLtjLmN7T1hPLIaAbGUkwqZvCX1fphvPrFSUne1t3Den2pZ7Ysg0M04iolD8ZVlTAlK Q5+k2LOkLaHNC9AhxYDlYSgi6WldTJLOJXiVK3KCMKaHw04Y2O6+UCoY5EY7CWX0e19bFb cB1daiNZMHaXhUVRlP4K7cam47U6HD8MovcZ61atGIR2x74+RS6/svl3kOZ3hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737806401; a=rsa-sha256; cv=none; b=Zi0p1YVLMQBXvWdUGDW+9DVWdMfHHPgJL+PoSLFqkPrZIiN4mOZI/YV1+IJqmJ+DBzC3RY H/HrMBKl5/CCDarzHjdRcDmfDdLbqZggbqLPt20Dns3dW0T68Xfb1d1XeMvHe2DNsg4+LP MF4iZkmQxu89s+zzPHTZbE1XWnBRvd/XTegANpZXb3pkYQJc9t0M72Q77QMRHFMikKs7/v CQn9j6PBFk0CVgIRXf/D/6OB0gHLY0sAjIUUAz314Bl/KQf8zAc1jSo205qLqS02MteL82 YdVTLx1geF1EZp3f6hcNtXQ5JJ2+bZrETGXnjHb0XHA5zEJHEC4T8LgegT1hbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgCss4dGFz19jx; Sat, 25 Jan 2025 12:00:01 +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 50PC01an013065; Sat, 25 Jan 2025 12:00:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PC01oR013057; Sat, 25 Jan 2025 12:00:01 GMT (envelope-from git) Date: Sat, 25 Jan 2025 12:00:01 GMT Message-Id: <202501251200.50PC01oR013057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 47560d54be59 - stable/13 - sysctl: Fix usage() and SYNOPSIS section of man page 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 47560d54be59f89e1768e7b4d81f5c599a9c59ef Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=47560d54be59f89e1768e7b4d81f5c599a9c59ef commit 47560d54be59f89e1768e7b4d81f5c599a9c59ef Author: Zhenlei Huang AuthorDate: 2025-01-23 07:24:15 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-25 11:56:41 +0000 sysctl: Fix usage() and SYNOPSIS section of man page I forgot to update the usage() and SYNOPSIS section of man page when adding the two options -J and -V. While here, fix the options sort order in SYNOPSIS section. Fixes: 5ec83c660aca sysctl: Add flags to filter jail prison and vnet variables MFC after: 1 day (cherry picked from commit 0ee3e29e1d9ee3ed22441c0d580d2d1e57a1d9e3) (cherry picked from commit 1d890d546b064f2c7753b949f5dbf00d79cde292) --- sbin/sysctl/sysctl.8 | 6 +++--- sbin/sysctl/sysctl.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8 index ff0a8cea266d..a7af56720361 100644 --- a/sbin/sysctl/sysctl.8 +++ b/sbin/sysctl/sysctl.8 @@ -27,7 +27,7 @@ .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" -.Dd October 29, 2024 +.Dd January 23, 2025 .Dt SYSCTL 8 .Os .Sh NAME @@ -35,13 +35,13 @@ .Nd get or set kernel state .Sh SYNOPSIS .Nm -.Op Fl bdehiNnoTtqWx +.Op Fl bdehiJNnoqTtVWx .Op Fl B Ar bufsize .Op Fl f Ar filename .Ar name Ns Op = Ns Ar value Ns Op , Ns Ar value .Ar ... .Nm -.Op Fl bdehNnoTtqWx +.Op Fl bdehJNnoqTtVWx .Op Fl B Ar bufsize .Fl a .Sh DESCRIPTION diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 0fe6c92dc386..887de78d269b 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -122,8 +122,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdehiNnoqTtWx] [ -B ] [-f filename] name[=value] ...", - " sysctl [-bdehNnoqTtWx] [ -B ] -a"); + "usage: sysctl [-bdehiJNnoqTtVWx] [ -B ] [-f filename] name[=value] ...", + " sysctl [-bdehJNnoqTtVWx] [ -B ] -a"); exit(1); }