git: 79fbc4ccb6c6 - stable/15 - release: Use PKG_CMD when installing pkgbase packages in vmimage.subr
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 29 Oct 2025 12:50:31 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc
commit 79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-10-23 22:21:11 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-10-29 12:46:50 +0000
release: Use PKG_CMD when installing pkgbase packages in vmimage.subr
This defaults to plain "pkg", but being able to override it is useful
when testing pkg itself.
Reviewed by: cperciva
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D53307
(cherry picked from commit bbe65c5e8c0e89ec14cb5d00153691850dadb859)
---
release/tools/vmimage.subr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 99e1936296e1..3bfef585f613 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -97,7 +97,7 @@ vm_install_base() {
if [ -z "${NOPKGBASE}" ]; then
local pkg_cmd
- pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR}
+ pkg_cmd="${PKG_CMD} --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR}
-o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes
-o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes "
if [ -n "${NO_ROOT}" ]; then