From nobody Mon Jun 29 03:02:16 2026 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 4gpWKP0lYDz6jmND for ; Mon, 29 Jun 2026 03:02:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpWKN4k5mz3mPD for ; Mon, 29 Jun 2026 03:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782702136; 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=DU6gsP5PlGYQON54/ETot38zZYUXthAO+B1cmM/zYuU=; b=GKU1YfWqj1VjwJyQPqZUXpR3nW+imuC9EdjnLpCbjwgNg0piJSrhX812WV1fSCfGUlDfQw QlyjKT5ri/ytmU/2fS8RULE1vARfvwgL5c0jLLeUedSPn06gcZUvRNvwHGTY8svRJIPRNo tCx0cyxoXAwIelkC5hScX5k/fDHAe2E891S0qWkrzrJUR2DNZhtPHAarht5UmYQycgw+7d nLViF4cRAdyq9mwd+zHZvr1JDXjTJld20h/YgkiICedy796OhyoDnp4BvFgU44VRL+otBU Noh3jV6KJmiUR8Jg6Xbrw8r7layYFV9/zmF8NuO8mDdkH7bN9LSwgxmfK2zfTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782702136; a=rsa-sha256; cv=none; b=c6qFt7Pq7MvEUwZusWa9m61hspWP1QtrUTDuuM4+zqiwxr9MNPgmRERAEQwaYN8MqtD0r3 OVos337Kg7w+VZuEq+bVNUzgMCcrk95z+O8HchUaVhEIrmem/sDZes++bQZS6QYopcJiC6 zcqgyVGqREnimDwbip7jS6muqmRGS55wLa4JwlOnB81Bg/qZ2AYMKMGCFR6dufGLGExksf PP3nUn5LTW2BVMPEPhyF3Rpw+GHhazIajS6ekYF0LmTHY0s1hlTVOvRZ96VE3UO0RBU0Rf Z4wlrkpDqaD/x/ypWANk784wlFSCXhNOCHWeN5ek2/PFV+rDZ1uqBl3Wd2v4Yw== 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=1782702136; 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=DU6gsP5PlGYQON54/ETot38zZYUXthAO+B1cmM/zYuU=; b=L2v2gjd4ptYS4nuMtcfjiLukGeQCtkwiIAOqTfnsJYATgW5JFhVuQmeIAyQmGs7kncRrNI i16Z3urDKfpNWblcaHwlwb2ex+rw8mBr4waUlhNDbgg1Pkotbp6rS6TRkqwNAyMb8qkmaI KcnMeunGpWwqrxCgcn7eJLwEmbM//SjI1sJ/tQKWXe0XRXVkbwwOt3I/Nf/lS7052CaRps uFr4eolQkeruIXDcVLX3rDzNLjUnFzGYCmLd9U5Yb532HKC8uEk33+FZauPm37Hq649c1t N/EEI+I1cwbcO+y0D8YGrimlT+qfy2Wz3LUujH4oUI/7Z0Ymc9y9aa2hSQ+GXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpWKN39bfzfWk for ; Mon, 29 Jun 2026 03:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30d1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 29 Jun 2026 03:02:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 453cfe97276d - stable/15 - efitable: Fixup getopt args to reflect guid use. 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 453cfe97276d2b2e6ffc4c851ae39b5927bd2385 Auto-Submitted: auto-generated Date: Mon, 29 Jun 2026 03:02:16 +0000 Message-Id: <6a41e038.30d1f.262b9539@gitrepo.freebsd.org> The branch stable/15 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=453cfe97276d2b2e6ffc4c851ae39b5927bd2385 commit 453cfe97276d2b2e6ffc4c851ae39b5927bd2385 Author: Gordon Tetlow AuthorDate: 2026-06-20 02:59:49 +0000 Commit: Gordon Tetlow CommitDate: 2026-06-29 03:01:35 +0000 efitable: Fixup getopt args to reflect guid use. Correct the manpage to reflect the preference for GUID vs UUID. Take the long version of --guid for the -g option. Sort the argument list while we are touching it. Reviewed by: imp Event: BSDCan 2026 Differential Revision: https://reviews.freebsd.org/D57695 (cherry picked from commit 3a4e049c38143980e472b2926abde3c7549530c4) --- usr.sbin/efitable/efitable.8 | 6 +++--- usr.sbin/efitable/efitable.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usr.sbin/efitable/efitable.8 b/usr.sbin/efitable/efitable.8 index 52949abcb853..f0785d3ba7cf 100644 --- a/usr.sbin/efitable/efitable.8 +++ b/usr.sbin/efitable/efitable.8 @@ -32,7 +32,7 @@ .Nd dump UEFI tables .Sh SYNOPSIS .Nm -.Op Fl u Ar uuid | Fl t Ar name +.Op Fl g Ar guid | Fl t Ar name .Op Fl -libxo .Sh DESCRIPTION This program prints data from @@ -49,6 +49,8 @@ in a selection of different human and machine readable formats. See .Xr xo_options 7 for details on command line arguments. +.It Fl g Ar guid | Fl -guid Ar guid +Specify the GUID of the table to print. .It Fl t Ar name | Fl -table Ar name Specify the name of the table to print. Currently supported tables: @@ -61,8 +63,6 @@ EFI Memory Attributes Table .It Cm prop EFI Properties Table .El -.It Fl u Ar uuid | Fl -uuid Ar uuid -Specify the UUID of the table to print. .El .Sh HISTORY The diff --git a/usr.sbin/efitable/efitable.c b/usr.sbin/efitable/efitable.c index a506b4dea311..b9e3d424398a 100644 --- a/usr.sbin/efitable/efitable.c +++ b/usr.sbin/efitable/efitable.c @@ -75,8 +75,9 @@ main(int argc, char **argv) bool table_set = false; bool uuid_set = false; struct option longopts[] = { - { "uuid", required_argument, NULL, 'u' }, + { "guid", required_argument, NULL, 'g' }, { "table", required_argument, NULL, 't' }, + { "uuid", required_argument, NULL, 'u' }, { NULL, 0, NULL, 0 } };