From nobody Wed May 27 00:36:58 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 4gQ9fz3KlCz6f0lC for ; Wed, 27 May 2026 00:36:59 +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 4gQ9fz0MD9z3Lmw for ; Wed, 27 May 2026 00:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842219; 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=ZIO3i6r/iA288KSnv7VXpwFZQ/iTFO/LnUn4LKgDep8=; b=LlRtbqnjPP16wMkTnR0jtCc5YJOF4SPIzCfPedoK2sRbR964nMX5c3K8xngPrzNiiRYAjR ZDXGxZreC1qnychiRFq1Kls83g+BhpOXZzXJtYFjm6/laIi2vFY2sswCILcz8TETSVzx6D UZqF+NTesxGhgXNTfSd+8iQDI5GWD1qjgFoYGH+ooC5U+neZ41KHJ4+xi4DdDx3xsJuQup dSrvN6c2hXmczTZKy/lKUAgbkGXHU6NWeooGEYVfHYSZjbdGJ7H6ODqkPL7vw5WQrnjKxc QLWros75oktiEgZxAOBfMibeWaRKqgeLoaAjA/c5DnOU+DDDkJahIThEVildxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842219; a=rsa-sha256; cv=none; b=GxBBTiMunnBc5y8bdmbt0U2wRC5EjnXaGwXRfiTibdvgdNrab06wfAWqpC9m/+hjK7IVrr nxHRK9a5U0njyngDcuXO9PBhjN8GhCQFfQrXYxIb2dT+nYAFT8xjNeGQJYZdc1wrnoEu4V amqmWuQ1ElHi1e7lpHJ1zLXMLQhzPe1xFRkmPyj57hKuVT0d18/9e03Go7mqtY31v+E167 klL0BvsayP4l5bz+LGFuaqe8lDt1Tytr3z/jDvdTm195pahQvOQVJ1oLjSHPVv+d8seAh1 tytL2xYgcLgQVo+vylDbpkzkmgBXebK4E1p/cfknlvlsddMyfbR5JD1YdaPShg== 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=1779842219; 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=ZIO3i6r/iA288KSnv7VXpwFZQ/iTFO/LnUn4LKgDep8=; b=R568XRJiDcam2W5i00jB4hJCjdoS5z6KlkrC5DX0au3ySiKkkJpk7LR6ZHWiViFlfVsySL TCe4SqRCjWz+mRxL2xibL6SMCwL1QVtXO6K2+9qjziSR/sS8z0mwQANmuDpANJp3+agKAT S1dSjEdXCyN9qfshrIgs0fwn7c9ru5SOlKxhOyzSaV5/iXNsEsvk1929C+5teJJi0in24o E4Ytp4K1KA2niOrdh3EgYfrhH6rIDWcyvb3C2Q6aV0U5HWUHHX+2Z/J2q1G9Ax8kWEpddx nyHLL0X50s9brP6Z02l5/B+KSCN41PPB6Atph8UIotNE9rZOdeVE2Dswx4uLpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9fy6zsWzcQZ for ; Wed, 27 May 2026 00:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ffb2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:36:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 9d133c76402e - main - nanobsd: Get the code size by its partition index 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: 9d133c76402e769fd63ed838ad641572439cd126 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:36:58 +0000 Message-Id: <6a163caa.3ffb2.269c78a7@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=9d133c76402e769fd63ed838ad641572439cd126 commit 9d133c76402e769fd63ed838ad641572439cd126 Author: Jose Luis Duran AuthorDate: 2026-05-27 00:13:15 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:13:15 +0000 nanobsd: Get the code size by its partition index Previously the code was assumed to be on the on the first line of the _.partitioning file. Instead, explicitly look up the size by its partition index to make the parsing order-independent. The _.partitioning file: 1. First column: starting sector. 2. Second column: size in 512-byte sectors. 3. Third column: partition index. Get the code size by explicitly selecting when the partition index is 1. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57216 --- tools/tools/nanobsd/legacy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 6ce477ea0c88..efe49bbf692c 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -111,7 +111,7 @@ create_code_slice() { IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} MNT=${NANO_OBJ}/_.mnt mkdir -p ${MNT} - CODE_SIZE=$(head -n 1 ${NANO_LOG}/_.partitioning | awk '{ print $2 }') + CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") if [ "${NANO_MD_BACKING}" = "swap" ] ; then MD=$(mdconfig -a -t swap -s ${CODE_SIZE} -x ${NANO_SECTS} \ @@ -161,7 +161,7 @@ _create_code_slice() { ( IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} - CODE_SIZE=$(head -n 1 "${NANO_LOG}/_.partitioning" | awk '{ print $2 }') + CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") echo "Writing code image..." @@ -290,7 +290,7 @@ _create_diskimage() { ( local altroot bootloader cfgimage dataimage diskimage - CODE_SIZE=$(head -n 1 "${NANO_LOG}/_.partitioning" | awk '{ print $2 }') + CODE_SIZE=$(awk '$3 == 1 {print $2}' "${NANO_LOG}/_.partitioning") CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") IMG=${NANO_DISKIMGDIR}/${NANO_IMGNAME}