From nobody Thu Sep 11 13:06:53 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 4cMyWL1tDZz66dqf; Thu, 11 Sep 2025 13:06:54 +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 4cMyWL1Cqdz3d0t; Thu, 11 Sep 2025 13:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757596014; 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=8ExOhazj/hJgX+KQnXyrnKc8hwZx5S+aIR7gqln2rGU=; b=Hmz/bKAdqbDYjqNOIUlX4iKFcmpSUaDzowBZQb8DKDkO3k2aaaKbda/mzfk9jZFudZw41p 2Zx097gtHLpAUXRJshP8ILL7L64e3cYAq/wlj7TDLb/NehR07+LFPrHaWXIff4RYocR7uc WQh0CfEEfc18ZMX/P9xPVWvKphjCfWQkMwAuWXeoa8x0Q75DdJj9gnYajycSgvNhk11ojQ eMNvB/ieY2Sqg/8jQkX09Ic41Dk6uomum8dax+RQXg2Csm2Fr4KJWSBolZv87i37/yKyz2 rSZLEBSJoLqQdD4kemNT4BaBnGX3NhuIXXZt/cjP7qh03OjboounhQ6t3cIVOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757596014; 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=8ExOhazj/hJgX+KQnXyrnKc8hwZx5S+aIR7gqln2rGU=; b=UPzKZsJaWeNF06fP+GPKk18NkdUqHMR2Wo1GXE0+mtzT/QWjv0WGsA+tbzQUVaYcikK+sy 1pjC65d1qAYN4z9dop2gsM3cvs8Jq6WouJzc4yOD+VyTs7b2zMXFI6OyKRpjUhDPTnMnvd aKkKujPwpby4v2fGuP8PXk7qRS6tBil9DywkXJ4hFNoiE7cCAhupx+CAA5o+3dwmiM/XSy H/UUvYgswRrcT2wXy1+fdv0OIEu9KnAWN/StnuUi12C97oZ9iePwcV/SbP/ATYnIKx5Utp BjkPycsh813Jh3cRkCGtXm/CKicAQDqlQp7kquMU9sNG4xu2Uku66dfNVZF2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757596014; a=rsa-sha256; cv=none; b=cDIYWG0w5xIAG4bpjn+x/fRDnVKcynB362ZPlZxouW2RBJ2mPmUrcbWJIfDZVqH6GinPGI c66c/UBXwcLd0ppuSJ/SoOCNq0EyfjEJjNECKDgy+JAGbm7h02AOKNB3wDNpxUXXIHqBUq O5D2Clu2/AR0CRVLIdKpBm1OFl6OtgKL5687stvqMEjcBmfdWIFg/SOYStXB3WPAkXbCJD 4H0z/CBFYRoCr6lJ/mxMteEfkmWZR/zL8aIPwmcSO2UXwb+dZufte2cWmBhQQIDV/beSib c+s+pNa3Us1fplQt39IKr2Zm6Po9McGGxpWnVrKQBpAwrjusGJVnK+1LMX1V5Q== 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 4cMyWL0Tr8z17Tn; Thu, 11 Sep 2025 13:06:54 +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 58BD6rAm044158; Thu, 11 Sep 2025 13:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58BD6rnl044155; Thu, 11 Sep 2025 13:06:53 GMT (envelope-from git) Date: Thu, 11 Sep 2025 13:06:53 GMT Message-Id: <202509111306.58BD6rnl044155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 6207325f3aac - main - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6207325f3aac067fb16f0aa42012302014035ebf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6207325f3aac067fb16f0aa42012302014035ebf commit 6207325f3aac067fb16f0aa42012302014035ebf Author: Mark Johnston AuthorDate: 2025-09-11 13:05:13 +0000 Commit: Mark Johnston CommitDate: 2025-09-11 13:05:13 +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 --- 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 20ffe3b2dac7..32eec6f220e7 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 }