From nobody Wed May 27 00:36:57 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 4gQ9fy1X5jz6f0V9 for ; Wed, 27 May 2026 00:36:58 +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 4gQ9fx6hmfz3Lfl for ; Wed, 27 May 2026 00:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779842218; 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=x9uvXhPTAn96YXVQu8qPRkkQ00bUrqwJ5D3tZ658Sbs=; b=gK6lxjno6UszKO0QRlWIhNq78JJxotw8YTwhXdGH+rWpmP5dQKetak31cHcSVlQszvltdp L1jGvnJVWyKl4MZfi9SCxuVJVRspHE1vP4orMRlhRm7afVltomIX/JYsGOK8KU4dpgjuoG 0Agz6LJ72gD6sZgwxLFDVjfIwvSolNMuPfzQJBpwCmER7FlhD3oDyEbbb5AXt8EdTO5b/L XNRkR1a4x0p27VEmFiJXu55Cf2r2giU8JDxPnNIso88TgbuwtVD5T0JWQuMSXIPGVQPL+r Zcibd64k9BBv3qHdBXH1muV7ZYVpHHtoae4lpKWpZNw3q07UICurt3LGQhkwPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779842218; a=rsa-sha256; cv=none; b=HqyHNGF9gP0WHR8c2FHKy8q1AuoU5jvkOS/pF7f6u8AtwETKdsGvrw9r5rFzQ+kQZ4OcJj Uj5Dx8u0mtzRUltbLWGjSF181/D3dgCR0EUdoSV1SHRri0iW6VpcwyMMYCxMmX4mbrPCpY 0xgJlwnuheMSfS8CsunpptThskl/13JGba6IcyEPBzW4LjIKiifvEZToNB0GJWYfJTuTiJ HFajTgnyMpRABm/492hjuAGk8Q2SgAwr6KBlDHiMpNT4+ocw9zokvTJl1t/opqIrZKnnpP xPIOfjVk7r2I55Lp7dQQ8klJTQAxyhTNTiUUQQ058NwO6sqKGj/B4iO1RfqOGQ== 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=1779842218; 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=x9uvXhPTAn96YXVQu8qPRkkQ00bUrqwJ5D3tZ658Sbs=; b=ojY9loX5GNJ+rMc5+tOcFoHbH/LTUmTFA7Iwg3RuiQ5rzPnxc5j+et/FooZjXLT92iHwMg 0aeNQoFlvum5/R7d+0PTChdWr6ImKe8YrL9zphwIJ0P3mkCgFGOHFRqFBn2LRtoli7QQfD dpJlHFZTisuZVUEW8gEQJ4eMwZYFPGxScpRI+RNQjoLdEgfWc4q58gQE1PluJrBMcky/GF 0yohQPySuxZl0yjuZk8sHqU0hqNg8a9zPb+g0zb2in1kJ6dgz8U/ow2hpwWJeSdCO57Va9 QG6Kh6hq64bhPfpSVqclSX3fRZChDWoM9JbWGsrBlllNKeAxm9E48NBZqLqLZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQ9fx696kzcCW for ; Wed, 27 May 2026 00:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3de69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 00:36:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 689f7466c1ae - main - nanobsd: Use NANO_IMG1NAME 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: 689f7466c1aee7810e6a965e82338c765105a1cf Auto-Submitted: auto-generated Date: Wed, 27 May 2026 00:36:57 +0000 Message-Id: <6a163ca9.3de69.53228e7a@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=689f7466c1aee7810e6a965e82338c765105a1cf commit 689f7466c1aee7810e6a965e82338c765105a1cf Author: Jose Luis Duran AuthorDate: 2026-05-27 00:12:48 +0000 Commit: Jose Luis Duran CommitDate: 2026-05-27 00:12:48 +0000 nanobsd: Use NANO_IMG1NAME Do not hard-code _.disk.image, use NANO_IMG1NAME instead. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D57040 --- tools/tools/nanobsd/legacy.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh index fde4be9c7d5b..6ce477ea0c88 100644 --- a/tools/tools/nanobsd/legacy.sh +++ b/tools/tools/nanobsd/legacy.sh @@ -108,7 +108,7 @@ create_code_slice() { pprint 3 "log: ${NANO_OBJ}/_.cs" ( - IMG=${NANO_DISKIMGDIR}/_.disk.image + IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} MNT=${NANO_OBJ}/_.mnt mkdir -p ${MNT} CODE_SIZE=$(head -n 1 ${NANO_LOG}/_.partitioning | awk '{ print $2 }') @@ -145,8 +145,8 @@ create_code_slice() { nano_umount ${MNT} if [ "${NANO_MD_BACKING}" = "swap" ] ; then - echo "Writing out _.disk.image..." - dd conv=sparse if=/dev/${MD} of=${NANO_DISKIMGDIR}/_.disk.image bs=64k + echo "Writing out ${NANO_IMG1NAME}..." + dd conv=sparse if=/dev/${MD} of=${IMG} bs=64k fi mdconfig -d -u $MD @@ -160,7 +160,7 @@ _create_code_slice() { pprint 3 "log: ${NANO_OBJ}/_.cs" ( - IMG=${NANO_DISKIMGDIR}/_.disk.image + IMG=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} CODE_SIZE=$(head -n 1 "${NANO_LOG}/_.partitioning" | awk '{ print $2 }') CODE_SIZE=$(_xxx_adjust_code_size "$CODE_SIZE") @@ -177,7 +177,7 @@ _create_code_slice() { mkimg -s bsd \ ${bootcode} \ -p freebsd-ufs:="${NANO_OBJ}/_.disk.part" \ - -o "${NANO_DISKIMGDIR}/_.disk.image" + -o "${IMG}" rm -f "${NANO_OBJ}/_.disk.part" ) > ${NANO_OBJ}/_.cs 2>&1 @@ -231,7 +231,7 @@ create_diskimage() { fi echo "Writing code image..." - dd conv=sparse if=${NANO_DISKIMGDIR}/_.disk.image of=/dev/${MD}${NANO_SLICE_ROOT} bs=64k + dd conv=sparse if=${NANO_DISKIMGDIR}/${NANO_IMG1NAME} of=/dev/${MD}${NANO_SLICE_ROOT} bs=64k if [ $NANO_IMAGES -gt 1 -a $NANO_INIT_IMG2 -gt 0 ] ; then # Duplicate to second image (if present) @@ -300,7 +300,7 @@ _create_diskimage() { echo "Image will not be bootable" fi - diskimage="-p freebsd:=${NANO_DISKIMGDIR}/_.disk.image" + diskimage="-p freebsd:=${NANO_DISKIMGDIR}/${NANO_IMG1NAME}" if [ "$NANO_IMAGES" -gt 1 ] && [ "$NANO_INIT_IMG2" -gt 0 ] ; then echo "Duplicating to second image..."