From nobody Wed May 27 00:37:04 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 4gQ9g471tNz6f0n1 for ; Wed, 27 May 2026 00:37:04 +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 4gQ9g442jZz3Lv0 for ; Wed, 27 May 2026 00:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842224; 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=WP05kPHp1J6tUqPZACqUYdZVmj1AbOwqmCVBcQre9RI=; b=Qi4ak6LlXayXsUK1hQAtBCqR1rNR4smBaSbhC5wCpxLOHvxccNz9qRxBc5m2kSmo3DP1J/ OSujO2xEZheX7CNBQkYnDfXyiMJuIzo+KgjJuID4eBjkUqXnPuJPcRlKJ3BA7O9YNj2KFi 1u9m70encDVgAJpElNKLcpar9dABovgoIMl7xChPLB9NffgowvlUglMMf9+DgMxfa9A9NR VVGLXYrvnVo7Ss6221SSze9eO57mH/+J9rfjeQvpaca4t5hviEQL/Y7GtOzAh0/OQ757zf yL3d2XL7pfgRha13AYv5nNzzQWoFewWwvJupBcITjkLhsNy8Cz52gA2SEqNIMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842224; a=rsa-sha256; cv=none; b=Uabs4ihrKxAdbrXH7WlT3E3p3U3VyRfFw/g1uVugvxiN97wmZhxGlP5y6luQPcNJDJqS1M SEOWZcjLX7rBfHTJZyWZbNSrT3OGwoBC37QEhDbaobeUSgiwlUScT6gf+yuS83Go+2vYe7 TcSOemaRMIADTImXohlvag1OFVl1NBOVD+nS0zJNd4kgdZ7RwKYkucPhswpbB/uWvnM4DF WaS7gN5Crf7bD4+883FIjaUPVDuh5pxh5pwUHEvkr8Tj+GIxN9fYQWsOmvQW+719FP4Zbi ib803lcOzGlgF06gw++pFnwFnn4ZeMQCCbqyTO2zDqOkkXF+mBrDnCyeSQEtfA== 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=1779842224; 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=WP05kPHp1J6tUqPZACqUYdZVmj1AbOwqmCVBcQre9RI=; b=ExWy40sEXNZUggW2ta0FjkCexqLxAxM9EyIXO5sJULTBRvpLZNV23QszbXApgNtHFyQE6K 7nMXNT2PsIsTwxzRVS9Ez18YWZSY0iet5E0yXgmCL7rSoYdM5Y6a2phzXBs0hn7gGUk2k7 +C2qCo8mZNOJPDeeHceGsMKQh8td6eVLsGDG8KX+Eo6OztPoeet+DdGGIgy9GvqnELz8zv OAfZQMN1KVgRGMi78+R90SRoGFIibRQW+fUgP10pvhfQNREB9WNbS5xgA0tWW5wN9Y3DxQ L8boNrq06B/GePe78xh2lWSwFI8KXmI89qFTvsV9G7wA2vc+DgKeqPH4NE1Dnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9g43NBQzclg for ; Wed, 27 May 2026 00:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fca0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:37:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 318a85d4b201 - main - nanobsd: Explicitly set image size and secsz in mkimg 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: 318a85d4b201b1cb77f25c8a98d2b0687e8259e5 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:37:04 +0000 Message-Id: <6a163cb0.3fca0.379fe6f2@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=318a85d4b201b1cb77f25c8a98d2b0687e8259e5 commit 318a85d4b201b1cb77f25c8a98d2b0687e8259e5 Author: Jose Luis Duran AuthorDate: 2026-05-27 00:21:57 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:21:57 +0000 nanobsd: Explicitly set image size and secsz in mkimg When building an unprivileged NanoBSD image, explicitly set the desired image size, by passing --capacity to mkimg in bytes, and the logical sector size (-S) to 512 bytes. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57222 --- 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 763f65c4dbdc..1d7a0cef2fed 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -178,7 +178,7 @@ _create_code_slice() { nano_makefs "-DxZ ${NANO_MAKEFS} -o minfree=0,optimization=space" \ "${NANO_METALOG}" "$(( CODE_SIZE - METADATA_SECTS ))" \ "${NANO_OBJ}/_.disk.part" "${NANO_WORLDDIR}" - mkimg -s bsd \ + mkimg -s bsd -S 512 --capacity $(( CODE_SIZE * 512 )) \ ${bootcode} \ -p freebsd-ufs:="${NANO_OBJ}/_.disk.part" \ -o "${IMG}" @@ -318,7 +318,7 @@ _create_diskimage() { if [ -f "${NANO_WORLDDIR}/boot/boot" ]; then bootcode="-b ${NANO_WORLDDIR}/boot/boot" fi - mkimg -s bsd \ + mkimg -s bsd -S 512 --capacity $(( CODE_SIZE * 512 )) \ ${bootcode} \ -p freebsd-ufs:="${NANO_OBJ}/_.altroot.part" \ -o "${NANO_OBJ}/_.altroot.image" @@ -350,7 +350,7 @@ _create_diskimage() { fi echo "Writing out ${NANO_IMGNAME}..." - mkimg -s mbr \ + mkimg -s mbr -S 512 --capacity $(( NANO_MEDIASIZE * 512 )) \ ${bootloader} \ ${diskimage} \ ${altroot} \