From nobody Tue Jan 20 17:14:09 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 4dwYpH4RMtz6NqXs for ; Tue, 20 Jan 2026 17:14:15 +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 4dwYpH03fGz3XhJ for ; Tue, 20 Jan 2026 17:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929255; 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=kqAgLxzzh8ZEMqNWNe89jf6G5iqyS2csBMvKKXLYeIE=; b=JsvNbMpxMNWtQWJSOWjMaU6VgI6BvejQtY6gOx2Z/G3Ws7ZlFjjIPGHkZymtF0ISKU+utS O7mlRdMnmp9X/3BY4LMh9miPuzOg5dxq70L6xQThpoNDIJPDeBNmfmrb+PfmW89WcG51NI iLzOppnpTVdUsbmEEmpWoYUTCQHhk6waaJs8IVth6D+sOBo3fxAK7zAtaCSgTVOx2nudzB Qk9xNM58ggZxteNZeOKPbE928zGrmGFhyCj+lZJb3gYuc9sNo2+W2sLBndF3dKAbZnvBab Q6UT3NTOOOgicZCcziYpdKXRhgNstQ/lcqUE+YcfHDOmC5FSHxS9ZgGqHREe7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768929255; 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=kqAgLxzzh8ZEMqNWNe89jf6G5iqyS2csBMvKKXLYeIE=; b=nWJ6gbzZN3zJlbly79kAd61cM/fCVBrCgR+GqnPFCNSQxOqQ0th8aRzUzOYDxHf1p5R1dI heQ6S1D85L7xmYbUFMeWpGzqp0L0kxbiCkMztYG0K1DQD8M0YgZ0mYTLvxg1Q2ygB2gt/H nmPAGsBHBpnvKbTLFOR+N0nMAQUjYBU6xhQhfVl6EfRSqGOPA3Gw5THT7gL7gY4+pmY/sv sssH2h/QslBbLAkshgbSXWmG0HclhCr0O3jBPPmH4IOiTfojWZKMnwsFrO7huXvaBWDEoc gttps4cm+BIjR/4WQ+tr6Dn40ZV50cQ/rnnj0jPDAOeEFuXtrp4oVlxLNbg5RA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768929255; a=rsa-sha256; cv=none; b=fOfiHgBb+KbkB+omGLIApQL/qQN/ZZyKzfp3lfFLHbHI8g9My3dS3mLR1L6rjKnx66cfSX 7f9wCGwaLTMTKR84Q3JpbYcHMIWUib5xKRS/3Ap+QoFmILRlydubTNY5IebQwdYaZxo2Yf R+skqeooCmo/ipglPtvh49FGgEorufEIgVeuUKyxJWslY/03teZDOQmOR5vSDa+DITqaPd MUwsjQChK2qc8QbNnxRqRW/+bJppswuhrPNEouzenEJazby/lP+Ui7gkdbyKuBTBo2F24k /v3zb30IVzb723Eg+Ni7ysmrFazwl8dskECRoXE8zLgn5uCrf48nLd+DTH1Xpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dwYpG6j1Kz1Pxg for ; Tue, 20 Jan 2026 17:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 345e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 17:14:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3b44f04225bc - stable/14 - gpart: "gpart --libxo:JP list" duplicates attribute keys 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b44f04225bc3f2ca33cff90273b8cdfea67774e Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 17:14:09 +0000 Message-Id: <696fb7e1.345e6.5017d01f@gitrepo.freebsd.org> The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3b44f04225bc3f2ca33cff90273b8cdfea67774e commit 3b44f04225bc3f2ca33cff90273b8cdfea67774e Author: Alan Somers AuthorDate: 2025-12-05 16:16:53 +0000 Commit: Alan Somers CommitDate: 2026-01-20 17:12:53 +0000 gpart: "gpart --libxo:JP list" duplicates attribute keys Add leaf-list modifier to attrib as it's possible to have multiple attributes on a gpart provider. I purposely made it so that the normal output still says "attrib:" just so we don't break any scripts people may be using to parse the output, but the libxo output now says "attribute" just like `gpart show` will do once https://reviews.freebsd.org/D53950 is merged. PR: 291377 Reviewed by: asomers Sponsored by: ConnectWise Differential Revision: https://reviews.freebsd.org/D54080 (cherry picked from commit a0347b0f3a6088872c29eddb85154478d543dffb) --- sbin/geom/core/geom.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 6631e6b7f6af..b00cea2b75d3 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -913,8 +913,12 @@ list_one_provider(struct gprovider *pp, const char *padding) } xo_emit("{P:/%s}{Lcw:Mode}{:mode}\n", padding, pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) { - xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, - conf->lg_name, conf->lg_val ? conf->lg_val : ""); + if (strcmp(conf->lg_name, "attrib") != 0) + xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name, + conf->lg_name, conf->lg_val ? conf->lg_val : ""); + else + xo_emit("{P:/%s}{Lcw:attrib}{l:attribute}\n", padding, + conf->lg_val ? conf->lg_val : ""); } }