From nobody Sun Nov 16 17:14:07 2025 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 4d8ct81Gdfz6GlqJ; Sun, 16 Nov 2025 17:14: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8ct80ZbYz3qgx; Sun, 16 Nov 2025 17:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313248; 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=pd24mHrBX/9FcYJZNwmfpw/2TV02uFb/u9Qgzy6rG2E=; b=Q05Ze6QM4lhRSZ8fHps7bSFgUnoDbLiFvxhri/canHsXIROTMEhrW6DjvVzGT5NPljbOsm s+VPvC9oZZRaAseTtFBsqon+gsBUYbVejTEi9qXkZar/i3IoxsW5pkJ4umEKA+bgK8v0wg Ykuh62Jean2AMmYPqEpI/BreWWps8jplekdwPzUUBuK8EphKGn2yH50qOUndGoQHmhJrtZ 37BU6+eKeqMY8e7ZbBYvSJzxkpPIoQkIfqf6b0cwsDJQfG4VqUE3EngIRk+rtD5njFdzka gx9R9tcFSwSgD7L//uLW7/JLNQkGKLSanvpwhFxSIwYRDN5Qx1vdJFyxN0hg0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313248; 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=pd24mHrBX/9FcYJZNwmfpw/2TV02uFb/u9Qgzy6rG2E=; b=pc1T22V07DhruJGUe/RB/GEerQuUW/pKwMShEbvNI1LcVtXs+U90Y1icTFsNHf7ajsYf/R 35e9cVSOWbjAvNnlPiTCAlwOcX6ClPT2imx+ErRLsHssXwAie8iVari3Fto8tQajP95gRr c9iDb5c1Ez3uKZ/s7n6pPsgZU6fAzCwigUASAHYJ7NUk4TuSm/yRMqPTUYZ6589y4PA4Kd X8TcDLY2qbiGr8cbv0xoG0xwOrcSxxi2yNutJT8sBoxQJ9CC6ro3Lkaw/rkKctO2lBcJ8O kb3+iZMw+h/2pPKOrxVu/k+QMFRYHGvfp1UebuCr/TijFyp8N7ckiQ/QNdI2yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763313248; a=rsa-sha256; cv=none; b=D++QpqSH/YC40mDCZ6IIh3BUhBsWou5HYL2y6mXwAhv5V1898womBFrYI8x2K+vWZ8D7y7 awSt/9Cp3iEXiGuCZrSwN1AqX9gIQpmrM8ZzAZHxNdwKe91+90b8Rqqt60c7vkkPAwAOQB oWRD8qmeL8RH3BzE/upRQkkhCfDCjJVNEam6Bo3uNaZOSBdGT7QnhIjxz/tgh6X8VBDhOf DpKpV0a3+plnSz0efCY4iAozdz8vH3JvuEetsX8wSGlnUwt1Bu9VOhgVAWuJpTGdhAIBnH yqErBGmkt6ZlUPuzLmIsdv5CGiiX9GiXHqMyrthUbYFDyjqW/hax2lueU/X4Zw== 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 4d8ct808XKznjt; Sun, 16 Nov 2025 17:14:08 +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 5AGHE7tk073977; Sun, 16 Nov 2025 17:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGHE7Zn073974; Sun, 16 Nov 2025 17:14:07 GMT (envelope-from git) Date: Sun, 16 Nov 2025 17:14:07 GMT Message-Id: <202511161714.5AGHE7Zn073974@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: aa33b6b820e6 - main - vmimage.subr: Log correct paths into METALOG 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 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/main X-Git-Reftype: branch X-Git-Commit: aa33b6b820e6889a9eb11aa8aec498cb890c589a Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=aa33b6b820e6889a9eb11aa8aec498cb890c589a commit aa33b6b820e6889a9eb11aa8aec498cb890c589a Author: Colin Percival AuthorDate: 2025-11-16 17:12:00 +0000 Commit: Colin Percival CommitDate: 2025-11-16 17:14:02 +0000 vmimage.subr: Log correct paths into METALOG Paths all need to start with "./" because that's what newfs wants. Fixes: e0c41af9256b ("vmimage.subr: Enable FreeBSD-base repo if pkgbase") MFC after: immediately --- release/tools/vmimage.subr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 03d92850f2a3..d718150d8767 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -109,8 +109,8 @@ vm_install_base() { metalog_add_data ./var/db/pkg/local.sqlite mkdir -p ${DESTDIR}/usr/local/etc/pkg/repos echo 'FreeBSD-base: { enabled: yes }' > ${DESTDIR}/usr/local/etc/pkg/repos/FreeBSD.conf - metalog_add_data /usr/local/etc/pkg/repos - metalog_add_data /usr/local/etc/pkg/repos/FreeBSD.conf + metalog_add_data ./usr/local/etc/pkg/repos + metalog_add_data ./usr/local/etc/pkg/repos/FreeBSD.conf else cd ${WORLDDIR} && \ make DESTDIR=${DESTDIR} ${INSTALLOPTS} \