From nobody Fri Oct 3 16:53:37 2025 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 4cdZVn3qD8z6BBZn; Fri, 03 Oct 2025 16:53:37 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cdZVn30R9z3Gqt; Fri, 03 Oct 2025 16:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510417; 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=Bv2pzj28V0CZMxHva7FG/sQMypLi0pKX+mwGz29iFf0=; b=l6Cyydejczaq5N0aq6r/gHpqc0IWF1sUhdI/0DRLe99r1x6ssjrxVz3cxeCmVY6eCAG+Xk Ubc8C8iHrvh7/2Y+uXH+0SKmtCdaWwoagQHeWK9/HqlENp30bDk8Kz3NqEJMa3uA+/WC94 n2L7m4/Wm5Sp2RTrk9Xqmxp8v7KZb20L1nxRrMM2sHRG6BmJ60owPZTryDK+6icsaHd+CC 6W+aVVFGZiVOr0l4xQlCbB69NhUfgz4DR4HYoSWzyvrYVWFqorPS901ey4MoYQjBorwkhZ 0+ty5sR1kFIKh35KqZ9JhVwyD3C1AYc/XKSINsFEb7y4+9T5piIMNWhuW1rMpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759510417; 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=Bv2pzj28V0CZMxHva7FG/sQMypLi0pKX+mwGz29iFf0=; b=LMqLH4l9HJFd3hEho67knUZ4nJY2NuVXwgng1S6AJMALtGwWFih+3najrua28wpCUn1k/e rRzwSJ1JLJVwbfzEU9YrgTZrJIOu3olpsaA5fNKVkmIdCglAfxdw8LsCSOJibuK+eHDlhS zYh40sDXmPgh1+cq5Ub2X6YqbZxmZUWFJwq7a9Hji87yS6oxvN7RPmLnPHOkfuDfRlhNRm zfLhwfBT+/mI3axRypeBoNx6nwW/3M1srGFOMKIAsjcBVBUw24yGRpbti98Z4zDgg3tNyN 44LoaVnE7VAVO02AoRDhDWZW5F0ofq+124t4qhgKorzsVy9Z0rxWtIOlBRfy6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759510417; a=rsa-sha256; cv=none; b=aVYOW88MCeUb5CBWMpRFPbaNIkUaE90djcbuwBs13vr55ZZ0XRegWFyP6z9MBAnq5+tO7g clgd6OGVlyaeKSBvGobC+DHrU2jroT2VfS8sCrp0/TMVL33JuNMVGwATN94PZcQ/wqynp3 F32TMkjbqeyopGQzXYLV00HiAtzIH5lZ8T8ZI4Q8l1kYLLUw3ZFKMGKgqtGlRQv1of7/Eb +i4ZKNQ6os2oV08Im1GKsWu0/BRZ9tPwPx3s+k8V2EpBzH70FmC8MU4/e3bVwjoKbdrOtG /JGTaC5mLfbjq93DdLmXRhUuazKuPqeQKpr0FG+1Gmwg15FtMXcYtBG6v8QgRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cdZVn2TP1z138k; Fri, 03 Oct 2025 16:53:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 593Grbrq064017; Fri, 3 Oct 2025 16:53:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593GrbTI064014; Fri, 3 Oct 2025 16:53:37 GMT (envelope-from git) Date: Fri, 3 Oct 2025 16:53:37 GMT Message-Id: <202510031653.593GrbTI064014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: e9f564a47e93 - stable/15 - release: Made it possible to specify more attributes in metalog entries 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e9f564a47e93a1c6bf806c13d8d6612d5a252c21 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e9f564a47e93a1c6bf806c13d8d6612d5a252c21 commit e9f564a47e93a1c6bf806c13d8d6612d5a252c21 Author: Mark Johnston AuthorDate: 2025-09-11 13:05:13 +0000 Commit: Colin Percival CommitDate: 2025-10-03 16:41:57 +0000 release: Made it possible to specify more attributes in metalog entries Verify that the target file or directory exists, and add support for an optional mode. This is required to enable NO_ROOT builds of some cloudware image types. No functional change intended. Reviewed by: cperciva, emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D52449 (cherry picked from commit 6207325f3aac067fb16f0aa42012302014035ebf) --- release/tools/vmimage.subr | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 9ee2e1d47a59..dbec38485fec 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -39,8 +39,21 @@ cleanup() { } metalog_add_data() { + local file mode type + if [ -n "${NO_ROOT}" ]; then - echo "$1 type=file uname=root gname=wheel mode=0644" >> \ + file=$1 + if [ -f ${DESTDIR}/${file} ]; then + type=file + mode=${2:-0644} + elif [ -d ${DESTDIR}/${file} ]; then + type=dir + mode=${2:-0755} + else + echo "metalog_add_data: ${file} not found" >&2 + return 1 + fi + echo "${file} type=${type} uname=root gname=wheel mode=${mode}" >> \ ${DESTDIR}/METALOG fi }