From nobody Sun Jan 25 10:59:48 2026 X-Original-To: dev-commits-src-all@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 4dzTFx1qqkz6PLqG for ; Sun, 25 Jan 2026 10:59:49 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzTFx0kr9z3cSv for ; Sun, 25 Jan 2026 10:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769338789; 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=wFsWTkmZg2DLjv22U8IjUhP9QNtfaWNiEaCyz3JJUHc=; b=Y2G/oxO6pzgUg9Y1S8hln3uhMUxVlpfo3jk8GK8DY3lPNZGEVfxaTyyvUnO9QpJIZOwjWc 8PrR+Fe8HekKzl99a6z7Asp0T/6yKvCEeZjjHa/SJgFWTPxXAspsPJuo3hspkjMXWn+yIw cjwhI4i2g5s3bs/NV8R8NZwi790FpuXIZK+U1SHo0GH/8WneBOuOM0vPFfNjg2mRHB51hP tpfbNwp/3eL9YuRA0uQOvQ74/yNBchm7aVqH67d13GzhA7srHJowdqJvtmGvz6QBUBoLEo R+lTzNoE/ZgmpxXyOFHFolcwzAlTruR/ihuLBsTATgNsiF/qWxOQz2eoOMrneQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769338789; 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=wFsWTkmZg2DLjv22U8IjUhP9QNtfaWNiEaCyz3JJUHc=; b=jxr/fdPFEmZWht6ZY2CTlPqyYzH2hi9tCaNjVWJ+D9TlNnaNGwVA41Y1bF+E9sgoxv7OuF hMBE904FiJQs8MHe8XoZWIMhlrdJYmXCo+1hNTDKAvvVj4JsE7/k+0JcaEtrYYOj+oMmRB vcWGLy7vL3buQOOAFUR5Lv3tOHXOQztePA0MvG+2kdnaeP8Cj/WxffYFNmkILgLJYQjzVh Ys2ezdA3NfufaRFt99/SkwcbX1U7Of1q+75vUmlFImZwDUcagLciM95/qcK8PYA7B9DYi4 o8kgI5bsvU2HfkfHW5A4vMK4FcXyAlFYp143CecCZ8OO3E4rw6swCPGI6l/gdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769338789; a=rsa-sha256; cv=none; b=SXTJYQScVAe9MgzyxwjhayC+fWAzSyeSwNqIUTmTm5Uq+bvL7+HGCYyfP9pee4EJFNovEZ 48PJO6+s+ddHPri5yn7Nm07xENDxA1DQVzOpTbRklu1h+ez22sY2MhEYcoh6Djom+EkWsv b9oB6NYXzShAFMjIXZVYHSTe0eP3S5Js3nOGyQOb48m4M4iBtcswpVjcrR4CNEsm6IH4Df 682TzvjHSBNgVgl4R/2TFylcYFamTeWlgaNm1gvjQUEWfHFU4KZK5YPy2daKj5adGlV4te AmH0n9cTxwlEPsZFLOKtLdxlEodhKnfo16F3OOFHmRsXcl+28JW2VzB+Y96wgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dzTFx01dWzY1W for ; Sun, 25 Jan 2026 10:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e220 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 10:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 4f093770b5d5 - main - nanobsd: Fix _populate_part() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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: 4f093770b5d55e176786db27d6f99639ae42a40e Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 10:59:48 +0000 Message-Id: <6975f7a4.3e220.3cf850b7@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4f093770b5d55e176786db27d6f99639ae42a40e commit 4f093770b5d55e176786db27d6f99639ae42a40e Author: Jose Luis Duran AuthorDate: 2026-01-24 08:58:05 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-25 10:59:27 +0000 nanobsd: Fix _populate_part() - Avoid unnecessary subshell execution - Fix removing the temporary and empty /cfg directory - Do not remove the generated metalog file for /cfg or /data partitions Fixes: 61ac7309c366 ("nanobsd: Add a provisional populate_part function") MFC after: 3 days --- tools/tools/nanobsd/defaults.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 31f3df9a3086..0e5af1e3e95a 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -745,7 +745,7 @@ populate_slice() { nano_umount ${mnt} } -_populate_part() ( +_populate_part() { local dir fs lbl metalog size type type=$1 fs=$2 @@ -762,7 +762,7 @@ _populate_part() ( else if [ "${type}" = "cfg" ]; then dir=$(mktemp -d -p "${NANO_OBJ}" -t "${type}") - trap "rm -f ${dir}" 1 2 15 EXIT + trap "rm -rf ${dir}" 1 2 15 EXIT fi fi @@ -770,8 +770,7 @@ _populate_part() ( # If there is no metalog, create one using the default # NANO_DEF_UNAME and NANO_DEF_GNAME for all entries in the spec. if [ -z "${metalog}" ]; then - metalog=$(mktemp -p "${NANO_OBJ}" -t "${type}") - trap "rm -f ${metalog}" 1 2 15 EXIT + metalog="${NANO_METALOG}.${type}" echo "/set type=dir uname=${NANO_DEF_UNAME}" \ "gname=${NANO_DEF_GNAME} mode=0755" > "${metalog}" echo ". type=dir uname=${NANO_DEF_UNAME}" \ @@ -787,7 +786,7 @@ _populate_part() ( nano_makefs "-DxZ ${NANO_MAKEFS}" "${metalog}" "${size}" "${fs}" "${dir}" fi -) +} populate_cfg_slice() { populate_slice "$1" "$2" "$3" "$4"