From nobody Sun Nov 16 17:15:02 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 4d8cvB23fQz6Gm8p; Sun, 16 Nov 2025 17:15:02 +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 4d8cvB1J0Mz3r8v; Sun, 16 Nov 2025 17:15:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313302; 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=iceJeUfmcUlreWP7WByqnhDBTjZQxi62CYifBn20UPE=; b=tjB++MF6KS/yEXiK9sFF+Od+qdTsjTEv4+uq5sV0k1l2LBDeQN4XogckLF+IoyWqpUbGKi BdTtrrEpNpnCLzHzQAZVUWbcG3VQ/9R7HrgXiFP6NcIQSeHvEuPbGXwNyAmBazBrGwefN/ 0Ktn3OfaRrthslWF4MekTh0a1+XNvinkp7pNdGcHq5iMwXcbUB46BK41i2wxEMEelxZQg1 todtgeuSwsFXrlpieBrj+qNp7JzMY2KgIp8dVk10rJAeDHpXNjOM3yXy/3J0mN0F7FqWcd s1OlQ4B2RSqpXWUIY2igZIqj/DrssJPlLBoB9gM9/Dw6worc9SRafGCNlyOfFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763313302; 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=iceJeUfmcUlreWP7WByqnhDBTjZQxi62CYifBn20UPE=; b=r32rbmibaDe59x4P6sxRSMZmjz1cxU3Kl69LCQc8nZnCEDGDtUaxYw1OsGQDEmsMPG+8x2 uG1P2F8W9zf4KrnKHnfBsumK1bqVzae+fW9XvK6lwPrZr2NRjGoonx5ntWjBk7O6zMhaLz h9Pr5Om1Agqlpmkfz8BWUbSHyzKUPJP4YKvQhDD2OAXQvaq3WaxlrAmAHy/MpG3pKVh9qu blW3xsf/bF99xQE5yUk7SMCFStsRJMZ3A1iqbuZR+jjnAe4RTZIbIBhoyfiPZgvwEuIDhk DWUcsswCUcEAkTehC8np/4/3v/iYjMRxG2hbrXR5bymYVez73geQCzgcHNOAQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763313302; a=rsa-sha256; cv=none; b=YKW9gjAxpJBPL5SRh9qekB63u1WvB3+T92FqbFX4uk45rMgMjJrrVyvq8W6ub98HaEw+Ct yjejpMiVsYjGr3u3urdZpQajWgdrYiQFvS25ajkXT8RaFcK0FU/Z9ZuX9DPDRXmtXkkE1l OhzQQgfWBWp3EZrI7OMMobMe2sV3ALWNR9/UBgbFetGaPzRgkP/moOBIBTDJsUP8I4IIXV 6/CfIYXNNRhJ9fj1Dlh1EmnDWMEsK/SQGT8aDdK9u2c/Igy6hAMatHhPdvt2Jq7ilsblx/ f2Bu8G03Jrzwajff2+bB2HD/IjSKf906X5VOHY6g6DPa+Z/XvPF0KrrjcV3yIA== 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 4d8cvB0n2qznm8; Sun, 16 Nov 2025 17:15:02 +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 5AGHF2lq074489; Sun, 16 Nov 2025 17:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AGHF2IC074486; Sun, 16 Nov 2025 17:15:02 GMT (envelope-from git) Date: Sun, 16 Nov 2025 17:15:02 GMT Message-Id: <202511161715.5AGHF2IC074486@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: c87b89d05340 - releng/15.0 - vmimage.subr: Log correct paths into METALOG 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/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c87b89d0534073324bdeb5857428b6299cd86074 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c87b89d0534073324bdeb5857428b6299cd86074 commit c87b89d0534073324bdeb5857428b6299cd86074 Author: Colin Percival AuthorDate: 2025-11-16 17:12:00 +0000 Commit: Colin Percival CommitDate: 2025-11-16 17:14:46 +0000 vmimage.subr: Log correct paths into METALOG Paths all need to start with "./" because that's what newfs wants. Approved by: re (cperciva) Fixes: e0c41af9256b ("vmimage.subr: Enable FreeBSD-base repo if pkgbase") MFC after: immediately (cherry picked from commit aa33b6b820e6889a9eb11aa8aec498cb890c589a) (cherry picked from commit e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f) --- 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} \