Date: Sun, 16 Nov 2025 17:14:29 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: e1560c8ba6a3 - stable/15 - vmimage.subr: Log correct paths into METALOG Message-ID: <202511161714.5AGHETHX074181@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f commit e1560c8ba6a3fd2601e5d96acb2edc0f8f14551f Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2025-11-16 17:12:00 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2025-11-16 17:14:20 +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 (cherry picked from commit aa33b6b820e6889a9eb11aa8aec498cb890c589a) --- 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} \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511161714.5AGHETHX074181>