From nobody Wed May 27 00:37:02 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 4gQ9g24b8hz6f0lG for ; Wed, 27 May 2026 00:37:02 +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 4gQ9g2260Wz3Ltd for ; Wed, 27 May 2026 00:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842222; 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=wXaFe3dXTR6XLIB+ELjx9lrFacjRAlrXcL02rnjoMQA=; b=xX8+fl10mt7rhdExR6WmROHprnQH1iD1Pz5Oikv11GBpdrEqUo4/Le2BlwMfRJBcJV2Tz1 spYueSNo9/J1A6XnxdaWfQqcJY9dcjxSJtJJZ/r3k6dWnurpW1rL2phrpxTbpVBFfGZD7S oJGSxUJY4iVNHL8pipMWm/2EoC2i9naiOgKPV1Tdr7qf4RV9+iikCfYobHgt6mcwiExg2W ALbzIMsI7X+ofNjwth8DtUmsDef8i70fbWtRlL41VSpXpXgnWfXWzPm5R1AdmaFKyyIEYY 1z9C/k5j2VCh99Hkq+qK9iHz4Q+XnlBuStIcsrDlSat0a0wJ5wz5lpbzowq32w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842222; a=rsa-sha256; cv=none; b=G3/FveiiPBkvL57fc0s0VbVZB1fWaWukyvCz9u0rB/hjw5w2iTUnm422je6DI3lqayhSqn x+61BhGZHYEpcPT3YrhAeCSnnhFCMMYZDHak5Jihw/U/9Tz3FP33mxuaLIp1j2QqulkGIF MtK4ZWKrYP1TTF+20sOt5gTo+OE3F/TLa5uj6JDK5C8zyaoTx/sippCmXJzH/85n0QSZCd ig2iJTm9JVKAtCheTzipg1UQYGe03VGjhsyNh8rE3kE3bpmDS3TUK2yOiTDR0xjnnsMCS1 2f8S3c8rJqGC0cFaxfNPPO8rJln11KRAM3qVsyd1eT3t4uRce+mZsD5cT/iTgg== 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=1779842222; 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=wXaFe3dXTR6XLIB+ELjx9lrFacjRAlrXcL02rnjoMQA=; b=ABDzeT72i+nAGRBCbhLIhs3uPGfPzrlFGq4yBFAJV1lXyuxZhnHci2KjJHaba+zSUGMLfK BjSUQYP8L64lC6raDpAJ9zt2acC8mPxjYSlIAe3il1glBeoroz2mDUpwTfZjJIsOyloZRP uwz8+ihvvSeU6sbOLo8tzM1gCjIWlTq0/N1AxLCnOB42yUMDhKsqKQMjvfIjxQQu5vL0lt zbgnO8+b443Xz8zeCzjCnj0ArROZ8vLuF7CkH+cgSiMcClS7WB0i90MtG4EUTkQIEFk3qr y7VF+fd2khRU2wLzRaJRBrZDmL5tQY2fZa3KBLOY69iiX/rtONUem2Wm3owlpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9g21dMnzcWY for ; Wed, 27 May 2026 00:37:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fc9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:37:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: dadbbccd8049 - main - nanobsd: Account for metadata overhead in code slice 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: dadbbccd804980895a098b01f553b5f7193daa81 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:37:02 +0000 Message-Id: <6a163cae.3fc9c.3976a787@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=dadbbccd804980895a098b01f553b5f7193daa81 commit dadbbccd804980895a098b01f553b5f7193daa81 Author: Jose Luis Duran AuthorDate: 2026-05-27 00:14:56 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:14:56 +0000 nanobsd: Account for metadata overhead in code slice The code slice size (CODE_SIZE) includes 16 sectors reserved for disk metadata (see bsdlabel(8) offset). Subtract these 16 sectors from the total size passed to nano_makefs. This prevents the generated filesystem from consuming the entire slice allocation, ensuring there is enough space for the metadata without overflowing the partition boundary. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57220 --- tools/tools/nanobsd/legacy.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 670a2f5ca968..8e57163c030d 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -31,6 +31,10 @@ [ -n "$NANO_SECTS" ] || NANO_SECTS=63 [ -n "$NANO_HEADS" ] || NANO_HEADS=16 +# The first partition should start at offset 16, +# because the first 16 sectors are reserved for metadata. +METADATA_SECTS=16 + # Functions and variable definitions used by the legacy nanobsd # image building system. @@ -127,7 +131,7 @@ create_code_slice() { trap "echo 'Running exit trap code' ; df -i ${MNT} ; nano_umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT gpart create -s bsd "${MD}" - gpart add -t freebsd-ufs -b 16 "${MD}" + gpart add -t freebsd-ufs -b "${METADATA_SECTS}" "${MD}" if [ -f ${NANO_WORLDDIR}/boot/boot ]; then echo "Making bootable partition" gpart bootcode -b ${NANO_WORLDDIR}/boot/boot ${MD} @@ -172,8 +176,8 @@ _create_code_slice() { echo "Partition will not be bootable" fi nano_makefs "-DxZ ${NANO_MAKEFS} -o minfree=0,optimization=space" \ - "${NANO_METALOG}" "${CODE_SIZE}" "${NANO_OBJ}/_.disk.part" \ - "${NANO_WORLDDIR}" + "${NANO_METALOG}" "$(( CODE_SIZE - METADATA_SECTS ))" \ + "${NANO_OBJ}/_.disk.part" "${NANO_WORLDDIR}" mkimg -s bsd \ ${bootcode} \ -p freebsd-ufs:="${NANO_OBJ}/_.disk.part" \ @@ -308,8 +312,8 @@ _create_diskimage() { echo "Duplicating to second image..." tgt_switch_root_fstab "${NANO_SLICE_ROOT}" "${NANO_SLICE_ALTROOT}" nano_makefs "-DxZ ${NANO_MAKEFS} -o minfree=0,optimization=space" \ - "${NANO_METALOG}" "${CODE_SIZE}" "${NANO_OBJ}/_.altroot.part" \ - "${NANO_WORLDDIR}" + "${NANO_METALOG}" "$(( CODE_SIZE - METADATA_SECTS ))" \ + "${NANO_OBJ}/_.altroot.part" "${NANO_WORLDDIR}" tgt_switch_root_fstab "${NANO_SLICE_ALTROOT}" "${NANO_SLICE_ROOT}" if [ -f "${NANO_WORLDDIR}/boot/boot" ]; then bootcode="-b ${NANO_WORLDDIR}/boot/boot"