From nobody Sat Jan 17 18:13:07 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 4dtlFc1Lxtz6P3pm for ; Sat, 17 Jan 2026 18:13:08 +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 4dtlFb5n5dz3pVp for ; Sat, 17 Jan 2026 18:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673587; 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=dN9CFb+zzoXVvPKjkc96XOg1vpLcjcLjiqXS/KiJjJ0=; b=FrkAsOiUNO7+JJ/Jo5yP4QbxTi0UEEs7H4xE/rpuF2U+sQ4ZY6VK686ybeyOHiDPbEpzVV augLNELNy9Cp/TppBI3UEwItMf7cLOijPFLsgMGKHNh6UJwSKPtxSsMSV4l+SpjL0M01+1 udz2QHhd8IwfDoqdJuFBA/Psv4WxbYA3hlUaYASie+FYSQACgsRY0FAjSHGshNaTmjATWX cR5twaNQ0VlfOksemoCssYmQk+Fn3t/0De0YaAkIueFsbbatNCqACFNWOlHQjCTiVoxbPQ 4jrmCa3o9WA6mkJhPmsaMZq3twxAB6mVYCfwrTegRVrSifxQhOmF6icAsdzFYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768673587; 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=dN9CFb+zzoXVvPKjkc96XOg1vpLcjcLjiqXS/KiJjJ0=; b=sj1lEr/Qo2+CkCkw4dzzBQVxq1zvfBC5iL8dvQAhG7VEIJwDti4mAwW4XRLLrCZvf/zk7U Ae5MJnkIp44dXm3dbUGzSDKV+ltRs4aCNCQ5uMll7waXEKQTH8QQnnY8BQRNvJmo4XMRXl rnycp/3uUL63I+nOl06iR2eASemLmO78mqTkjBUtg7rwVcmXr2AYxI37SJUfhOaHg+ruCu ONVZgJPP6Ij8qUJfdAyOwkACCew3DwDCCCv5J+zTqcf1q4cKckISJTeNadQ9rTHt6JXQjO oXeaDiyZtY9eUxtPqE7+DbbtnkTQ1rTwFmxUJiFjrmjb6UvZj9kaEz20SkB7YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768673587; a=rsa-sha256; cv=none; b=jzSFg8bR0LF9fBkGLbVv3lpvGK7/jMIKLiwI6mD8P+1EmIGEBBxY8+91ecYgO3//dxEPKH dIkXSsgTDY/vja6BU8LUWMtG3u0G1HZBVaZdjYRROdP1fvpL85fL8jiLTuLH2wy756j8B9 H++UKTirKBkqr0e3MEo1rmO2ox2qxRThNTnkqMaUghagHA4rKAZPRxs2iyBz2pxHcMMORK +1J9o/i6aDN0+NssJ17sKEnvjw+JGWhQfvF2HVjlu/ZeuX9aByrasLricHgGx4W5rShQwZ ZSNO+UMO4kDsZEaTIqjFv2DQoGYtMuYuEzrPW8oQTuVgj7TLZfR8jFB2ZmhC+g== 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 4dtlFb4Zntz19HR for ; Sat, 17 Jan 2026 18:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39dc2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 18:13:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 61ac7309c366 - main - nanobsd: Add a provisional populate_part function 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: 61ac7309c3669bdadd3983f0bb03440a7c147820 Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 18:13:07 +0000 Message-Id: <696bd133.39dc2.43c3269@gitrepo.freebsd.org> The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=61ac7309c3669bdadd3983f0bb03440a7c147820 commit 61ac7309c3669bdadd3983f0bb03440a7c147820 Author: Jose Luis Duran AuthorDate: 2026-01-17 18:09:14 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-17 18:09:14 +0000 nanobsd: Add a provisional populate_part function Add a _populate_part(ition) function that mimics the current populate_slice. Note however, that this function is not backward-compatible with populate_slice, hence the different name. A "_" is prepended to signal that it still experimental. It can be used to populate the /cfg and /data partition using makefs(8). Initially not wired. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48790 --- tools/tools/nanobsd/defaults.sh | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 9827095b334c..7775dd572fb5 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -724,6 +724,50 @@ populate_slice() { nano_umount ${mnt} } +_populate_part() ( + local dir fs lbl metalog size type + type=$1 + fs=$2 + dir=$3 + lbl=$4 + size=$5 + metalog=$6 + + echo "Creating ${fs}" + + # Use the directory provided, otherwise create an empty one temporarily. + if [ -n "${dir}" ] && [ -d "${dir}" ]; then + echo "Populating ${lbl} from ${dir}" + else + if [ "${type}" = "cfg" ]; then + dir=$(mktemp -d -p "${NANO_OBJ}" -t "${type}") + trap "rm -f ${dir}" 1 2 15 EXIT + fi + fi + + if [ -d "${dir}" ]; then + # 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 + echo "/set type=dir uname=${NANO_DEF_UNAME}" \ + "gname=${NANO_DEF_GNAME} mode=0755" > "${metalog}" + echo ". type=dir uname=${NANO_DEF_UNAME}" \ + "gname=${NANO_DEF_GNAME} mode=0755" >> "${metalog}" + ( + cd "${dir}" + mtree -bc -k flags,gid,gname,link,mode,uid,uname | + mtree -C | tail -n +2 | + sed 's/uid=[[:digit:]]*/uname=root/g' | + sed 's/gid=[[:digit:]]*/gname=wheel/g' >> "${metalog}" + ) + fi + + nano_makefs "-DxZ ${NANO_MAKEFS}" "${metalog}" "${size}" "${fs}" "${dir}" + fi +) + populate_cfg_slice() { populate_slice "$1" "$2" "$3" "$4" }