From nobody Sat Jun 20 18:15:34 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 4gjN1S0bSDz6hHWH for ; Sat, 20 Jun 2026 18:15:40 +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 4gjN1R5RFYz3jxw for ; Sat, 20 Jun 2026 18:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781979339; 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=svHD/mpXb20Wt9Vx23/cTDPxuw4KkZNQmssZrsLh6qw=; b=EA7TdA8eJ6u9EGN6jV+Z/NaHc6TJxqSoyzpQfJhM5fRC6p40yQ3AZUvDWMjGi6cbz64/bj jHKIZv8XzD1aE64Zi+SHNzCMnt9BD2WZu62fNoDuuEYcp/j/nqT9hGSASzj55evPygHPNP CmKB7WQ/eUB6vuoTUe241ogcKZj1Rv6JWlHc+jPw3wDkLk2Fwfh2c8FtcQukpZyf1GmVvY UdswZzVsIXJvKR0kEJMX/a2xjeoLxGBCv96KGaw/Z0v+AVITgcyB9b9E97ISXOBUnHd7yW feqki3+6pgYjAXDXXBgO39dky6XrGRut4VCR9dM0luvbyUIYM0+V3728gs7PQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781979339; a=rsa-sha256; cv=none; b=Ph2aiGZx/1drM4C/KIX6MYxo/6frVskAsbMNCbCYcdntlo434bhvmwTyl/AJi5Kh66c790 qx4CsVYELA7c9sAzyyN0oYgn18v310ygB3AbYq8WT0oTAF9T+DzSHYnzFWZT/07MW6Bgih xCXYWnPVZHwS6DditUQKRLR2TRMWo7ZyL8J2i/eKuY7XZLhIrCDaFkixdsXMSuTY3FLS0n nSwPQbctWikxf1FKSMCWp/1FOTGZq6mwug9dFUOkI8HaaHpc/Zt3xvS2GyWHsjnVMqttKB Ji//6k/NlXknr4L83YHVK5NO0zqhKL5VEaCKNi6XEXpvX+jblXNNLuGimucp+Q== 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=1781979339; 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=svHD/mpXb20Wt9Vx23/cTDPxuw4KkZNQmssZrsLh6qw=; b=Ejt3J8WQ8ZZWs0gudXwna4mauDT7uECCUisDB3eBuN6ghfW/eiaH3aXFxp4f7WLlTcLmq+ j27Z9y0yp5oHEofPh0J/w4PVMWW1kF2aVHHEorcBqWtGfkXl25DWFyZK3g6GZ6mlwBxqgu eT+RjDl18In8GP9huQgPd8p2xYyQ4qRtMx+5d3q2FqwToT+Ke6EwhmNGYgfVinxl+75ozU eje9tvG63tZtQVonEDqu1nXDSvbDN140/4qi+ufgCea+CB9PVpi1wfmpZ1bIkjrWDvdeej UndKAN5DWtJXihVPBjxNBR4Siqd81jYq+WIriTYsDUBCRViL39TnmPetfrmZ0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjN1R3XvGzhpq for ; Sat, 20 Jun 2026 18:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2668f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 20 Jun 2026 18:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Tetlow Subject: git: 3a4e049c3814 - main - efitable: Fixup getopt args to reflect guid use. 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 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/main X-Git-Reftype: branch X-Git-Commit: 3a4e049c38143980e472b2926abde3c7549530c4 Auto-Submitted: auto-generated Date: Sat, 20 Jun 2026 18:15:34 +0000 Message-Id: <6a36d8c6.2668f.7b0a6c4d@gitrepo.freebsd.org> The branch main has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=3a4e049c38143980e472b2926abde3c7549530c4 commit 3a4e049c38143980e472b2926abde3c7549530c4 Author: Gordon Tetlow AuthorDate: 2026-06-20 02:59:49 +0000 Commit: Gordon Tetlow CommitDate: 2026-06-20 18:14:56 +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 MFC after: 1 week MFC to: stable/15 Event: BSDCan 2026 Differential Revision: https://reviews.freebsd.org/D57695 --- 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 } };