From nobody Tue Jan 20 16:51:37 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 4dwYJB0ywPz6NpDJ for ; Tue, 20 Jan 2026 16:51:38 +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 4dwYJB09vKz3TRY for ; Tue, 20 Jan 2026 16:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927898; 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=JZ9UHZw9+FuxKEkbo4K6s42Ipas/YDJDibk389QYiLA=; b=VUtn1dwC9gV0ZlMYVYeSvqfHO7WSShRNMK2AtrViGbbmvjf9zbTajKyO7PYx47nbo0uQzC sZS3sd0lAr/DBOkI83wQWt5F6Vu90W5dHhyuWdD3oaiK/0zTsKO/l86gofE3mjvzwqqUI2 /8ru2MmqPiNoKlRi5IUACvlkSRmQy2FYeRRrdjFmVoeXiSV7ZaXclaojA02+BEn+ItCpVd z9ToXzy1RgPdAS/cR2DZDPAgU8jk8ogCHoMe21shO/bLrC+eLeI9H5ej/MVR/ZiDSm6WPd JMLhQsusKTmOI38dP3xAZJCMw82/RKu1ijxJYmUS8ERMXgA+4pnoDGFNzwwx8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768927898; 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=JZ9UHZw9+FuxKEkbo4K6s42Ipas/YDJDibk389QYiLA=; b=QrkCULFtLnF8LEKaSTOOpwvlIDOQTLIE0KpBIyFukHznv7FMJeEOxGUeFKPtx4vypFmUpx YDRC+zIiUPhWmf7sak279Py7V+gzaj0l/1xLUdgaJSgGzIyF/aNqPnmenSLgPWCB5bdYY4 aeZ/n08g9veKFIvDnsfL55cb9PVYPmaE17+6X2QF0i0OME/9bE5orXBV0dmfuUOlozLRHe Xv8+++yDUpxsHJLz7dSDRv6kt3PiwxXesc+SypwJoxdb1mcMGlEGBLYVI6DGh1VNCBRby5 AA5alwX5uBI9DvsbMnbZagUDYfyDJGsFhruIM5FQ0IaZYmKTwkhu7gBV0n81Vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768927898; a=rsa-sha256; cv=none; b=bB2UlUFrjHfq/fHvb4zwDZUMu8UQjs314oGg1NWcL13UXCA8e9tg7cfS9tAChPlaLDP6u+ l1zRPJ6UHi2ie3WSXsYIku3to7QHlmJ9Q22x+vGvdX7CE/yLvRavGPvcoUvvIu227aY/Vq F0ox5F8DCyui/lmF0yCPUY4W9/YjKtIU0WEUGQKt2nUw92mkNeaqi48qRtDPzs2KybmL+i on3CUbo22hzlwI/UclCyWBXR+UJpJ+7ETDXKr7zGMgHl47VBZcWdPO1vakwUsn/Gp0aaeE VKMjlmp3G0OrWErtvtG9FI67xkAfY8SiXCE1x+7Gsm05TfiwBOQ0nY5IiVxqvw== 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 4dwYJ96fjjz1P1N for ; Tue, 20 Jan 2026 16:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34db8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 20 Jan 2026 16:51:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: aed4089c2573 - main - nanobsd: Use NANO_DEF_{UNAME,GNAME} 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aed4089c2573420be042a90af51fb538d0b63fe5 Auto-Submitted: auto-generated Date: Tue, 20 Jan 2026 16:51:37 +0000 Message-Id: <696fb299.34db8.411530a6@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=aed4089c2573420be042a90af51fb538d0b63fe5 commit aed4089c2573420be042a90af51fb538d0b63fe5 Author: Jose Luis Duran AuthorDate: 2026-01-20 16:51:06 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-20 16:51:06 +0000 nanobsd: Use NANO_DEF_{UNAME,GNAME} Prefer to use NANO_DEF_UNAME and NANO_DEF_GNAME instead of a fixed "root/wheel". Fixes: 61ac7309c366 ("nanobsd: Add a provisional populate_part function") MFC after: 3 days --- tools/tools/nanobsd/defaults.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 86aaeffdc944..a0a186cee42f 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -780,8 +780,8 @@ _populate_part() ( cd "${dir}" mtree -bc -k flags,gid,gname,link,mode,uid,uname | mtree -C | tail -n +2 | - sed 's/uid=[[:digit:]]*/uname=root/g' | - sed 's/gid=[[:digit:]]*/gname=wheel/g' >> "${metalog}" + sed "s/uid=[[:digit:]]*/uname=${NANO_DEF_UNAME}/g" | + sed "s/gid=[[:digit:]]*/gname=${NANO_DEF_GNAME}/g" >> "${metalog}" ) fi