From nobody Wed May 27 00:37:05 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 4gQ9g64f1cz6f0SM for ; Wed, 27 May 2026 00:37:06 +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 4gQ9g54hKTz3Lv5 for ; Wed, 27 May 2026 00:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842225; 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=Nj+KOpCbASDAr3a2dTs4w2HOxxSqbA/H2u+hyD99LMA=; b=sSbGmtcT3toyWT4h/iOTcrCO+eQ9IxHtKxkx3NePKxuTe3h7fCs2hUEcyYOt+lnA0HrrrC C98Ukabwiv4B8dh2WlsQVEohWEJV/EPn4feTkZhjGMxL3/11cU7sNMYnw2720x0998FQOy N8k4unAxOrYFe8SgkOcV99FGOe1ExtveRmMPAV/fww+g1mbX7z6M+wIQby+tL718+1fIiO VdvZTZ42De3M4ikImBPangDWeSN5rWoMWRRPjxN4eg9X4X3mFie0+xJj6BUPC58rJDPvqV gFUNssRt1yKWxEB2h84rCbFTTZYhKf3myzIZ9xuvTPXSD/fWmHw6w3E0i8vxPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842225; a=rsa-sha256; cv=none; b=QQhO3vuqJlkeRyBjxnRwGzUTe3OoWQKjgE4pnEYJe9Uop2N18DC/sNqzYEDz3LDl/SfJUV Y5X5ebBwTvqQ/CIu4OXIfOqPhgUbO3PcijIqLL4AL8I9wYTRSo6VZM60ym37L9aXeaLgEA D4HBMUvQLKnnqq2c/64nat5dFgmB94N4QpFOgVf6g4decVc/3Wlm7IeMFGAS/QFllysQw8 IBMS12kEstnpVzb+AIVua7s1Z/GmEDX68x+FsEeNDEQUyEKtArzZKeM7+IdFZzE0hM+nrs Ipa4QFS6R16e+50JSLkcjc9lNu8Mq+4w4oeFiioYnWRne//UIw6TX/phIf88gw== 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=1779842225; 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=Nj+KOpCbASDAr3a2dTs4w2HOxxSqbA/H2u+hyD99LMA=; b=vrewAlQQh0OubQ5aSxj4ThJCI4l7EmE+YkGtdcJnG+KNXU+wzXthU5iJ2Sd+JvB9tDBooL NfR0wTxy+r+k1Ot9KrHpRT54pVSAHVzhuLdM2sJI894G5lPS8uRRC64+5boAgvaKulx6f+ 9Fk2mUlhwv/p6/XTidJFtBodVry2PSpUFGo1roZ2Jo2RiAd3mPhUjUHw8c1W7RGKr/VNee dFawQtMUtjaKzdMamLnTrMAKPsoSzUrE8396ueJn45qd8wxN+bpbB5pipa7Tv0YaF9XvKb Gom4dISRX7YDYsnskhnjtQwt/2cFHjB07+RxitRhWBt+pnxwS2sofjCXrtEuVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9g545vkzcWZ for ; Wed, 27 May 2026 00:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:37:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 87150a2ed140 - main - nanobsd: Refactor secondary code partition logic 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: 87150a2ed140d5a3c1272ce9cfe815f19282840b Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:37:05 +0000 Message-Id: <6a163cb1.3fb23.3680830c@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=87150a2ed140d5a3c1272ce9cfe815f19282840b commit 87150a2ed140d5a3c1272ce9cfe815f19282840b Author: Jose Luis Duran AuthorDate: 2026-05-27 00:22:39 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:22:39 +0000 nanobsd: Refactor secondary code partition logic Rearrange the conditional logic for building the secondary code slice (altroot). Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57223 --- tools/tools/nanobsd/legacy.sh | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index 1d7a0cef2fed..52d60b4fda8c 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -308,28 +308,29 @@ _create_diskimage() { diskimage="-p freebsd:=${NANO_DISKIMGDIR}/${NANO_IMG1NAME}:$(( NANO_SECTS * 512 ))" - if [ "$NANO_IMAGES" -gt 1 ] && [ "$NANO_INIT_IMG2" -gt 0 ] ; then - 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 - 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" + if [ "$NANO_IMAGES" -gt 1 ] ; then + if [ "$NANO_INIT_IMG2" -gt 0 ] ; then + 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 - 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" + fi + mkimg -s bsd -S 512 --capacity $(( CODE_SIZE * 512 )) \ + ${bootcode} \ + -p freebsd-ufs:="${NANO_OBJ}/_.altroot.part" \ + -o "${NANO_OBJ}/_.altroot.image" + altroot="-p freebsd:=${NANO_OBJ}/_.altroot.image:+$(( NANO_SECTS * 512 ))" + rm -f "${NANO_OBJ}/_.altroot.part" + else + altroot="-p freebsd::${CODE_SIZE}b:+$(( NANO_SECTS * 512 ))" fi - mkimg -s bsd -S 512 --capacity $(( CODE_SIZE * 512 )) \ - ${bootcode} \ - -p freebsd-ufs:="${NANO_OBJ}/_.altroot.part" \ - -o "${NANO_OBJ}/_.altroot.image" - altroot="-p freebsd:=${NANO_OBJ}/_.altroot.image:+$(( NANO_SECTS * 512 ))" - rm -f "${NANO_OBJ}/_.altroot.part" else altroot="-p-" fi - if [ "${NANO_INIT_IMG2}" -eq 0 ]; then - altroot="-p freebsd::${CODE_SIZE}b:+$(( NANO_SECTS * 512 ))" - fi # Create Config slice _populate_cfg_part "${NANO_OBJ}/_.cfg.part" "${NANO_CFGDIR}" \