From nobody Wed May 27 00:37:01 2026 X-Original-To: dev-commits-src-main@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 4gQ9g15rVpz6f0t6 for ; Wed, 27 May 2026 00:37:01 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQ9g133Zvz3Lqk for ; Wed, 27 May 2026 00:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842221; 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=B0WCjbN9FExl27S5Dg3M9gA8h4TfMDqEqL7ksfLSVPA=; b=pjq/QDBhlw1MF9QzOD3+Mo1hU0oF/njiEXNEh/1qYmK66F6NuMMcIrx17ulMhAn/kuCP8G aAakXHcDMnXtiN65yp+XN3eT1RN6uUZnyNpzel9NcT5nKOF1a0PbYIhk6PrSCwUer6T2xD Pun/84f54TsWkfzv9jjS9NSHhRpckqVTDNUHBeKMahc1Wt+SfPfXbmop85A4zEwhKqMGgz j3CzbbK/30FoIaRiRPlHPuW+u1LYgEfvk1WZ+LwY85eErwmV/9BxDeEzhzzUE1EDqkkUWu kg0t47GTGIOMCiKY4WNSHlOjZzvVMs5BgRTDot7UiFLYVMnQjWazJoQWljCO/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842221; a=rsa-sha256; cv=none; b=VxwlOGwp5xUW7ic8t/mOgz3NMjJGWd1YGmZrU2r8FX/a7zDocmXnTUSk6lqapF5miPMmVN T/omxqqk8ahyKxARTDoryguphrDcI84jYBiTURNRw/xZx2J3tZdMK6ezcIPo00eq6PH1U2 FjSLIcRv7wpdRFvrKRUHXD0GjrvI8iLw73tLRCOicXweFKpVVD0EgA/+qXtv1eN20Ngov+ 4KNs5shfCGGajC70yx3jT8kUK1wdVtgV1HO2AHLPWtE1sLUvsFUFMOE8f6O98Ktctrplmu gy1IoIgA+BNt+w/ozLRfZ9XXhFqW+ZaQnBdCbItfgrksUQhEp/ybABvptGcM5A== 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=1779842221; 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=B0WCjbN9FExl27S5Dg3M9gA8h4TfMDqEqL7ksfLSVPA=; b=r8n7NBMY/pyZctPl3fVY0xUKtZ90xF6DEemBaCx+wbc2Yf47/4vWV1ddBDEvIfKirKjDd7 rYb1zm3GYuhjRjIniEE3QO+Ib2GDKqx7R2IbEPdV9kRjOuOAXyNsfxXAX2cI48TIzizLOG Y16XqxRfOVXczENog3Q8PdLd9R5dq40/dIsalslFpxN71fAMo3R01RQEGNgMbQfPE7dCK2 cFjvUCPG+nPHLJ9OgTwnbNNtLhHbD3oVio56a/welOvvUZDlcVeRYguKTm0A/MgNRrsSJV k6C4eariRTOyO4K9SCCjBSNjF+7uZ+s6RYN2diubhe7rvaAhsmNUFozia2qEDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9g116HCzcgn for ; Wed, 27 May 2026 00:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ef3a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:37:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: beddf2c59173 - main - nanobsd: Use rounded sizes for cfg and data slices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: beddf2c591739a43e36c339b393e0beb3878d01a Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:37:01 +0000 Message-Id: <6a163cad.3ef3a.260a82f5@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=beddf2c591739a43e36c339b393e0beb3878d01a commit beddf2c591739a43e36c339b393e0beb3878d01a Author: Jose Luis Duran AuthorDate: 2026-05-27 00:14:09 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:14:09 +0000 nanobsd: Use rounded sizes for cfg and data slices Use the calculated (rounded up) cfg and data sizes from the _.partitioning file, instead of consuming them directly from the global variables. We obtain the size of the cfg and data slices by explicitly searching for index 3 and 4 respectively in the _.partitioning file. This ensures that the final image has the rounded-up sizes, and not the raw sizes. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57219 --- tools/tools/nanobsd/legacy.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index ac9cf4a3abe9..670a2f5ca968 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -292,6 +292,8 @@ _create_diskimage() { CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") + CONF_SIZE=$(awk '$3 == 3 {print $2}' "${NANO_LOG}/_.partitioning") + DATA_SIZE=$(awk '$3 == 4 {print $2}' "${NANO_LOG}/_.partitioning") IMG=${NANO_DISKIMGDIR}/${NANO_IMGNAME} if [ -f "${NANO_WORLDDIR}/${NANO_BOOTLOADER}" ]; then @@ -327,7 +329,7 @@ _create_diskimage() { # Create Config slice _populate_cfg_part "${NANO_OBJ}/_.cfg.part" "${NANO_CFGDIR}" \ - "${NANO_SLICE_CFG}" "${NANO_CONFSIZE}" "${NANO_METALOG_CFG}" + "${NANO_SLICE_CFG}" "${CONF_SIZE}" "${NANO_METALOG_CFG}" cfgimage="-p freebsd:=${NANO_OBJ}/_.cfg.part" # Create Data slice, if any. @@ -339,7 +341,7 @@ _create_diskimage() { fi if [ "${NANO_DATASIZE}" -ne 0 ] && [ -n "${NANO_SLICE_DATA}" ] ; then _populate_data_part "${NANO_OBJ}/_.data.part" "${NANO_DATADIR}" \ - "${NANO_SLICE_DATA}" "${NANO_DATASIZE}" "${NANO_METALOG_DATA}" + "${NANO_SLICE_DATA}" "${DATA_SIZE}" "${NANO_METALOG_DATA}" dataimage="-p freebsd:=${NANO_OBJ}/_.data.part" fi