git: c87b89d05340 - releng/15.0 - vmimage.subr: Log correct paths into METALOG
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Nov 2025 17:15:02 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=c87b89d0534073324bdeb5857428b6299cd86074
commit c87b89d0534073324bdeb5857428b6299cd86074
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: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} \