git: eb90941ee5ad - stable/15 - vmimage.subr: fix typo in checking NO_ROOT var
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 03 Oct 2025 16:53:50 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=eb90941ee5ad87cd69c13d089b72920f755c1132
commit eb90941ee5ad87cd69c13d089b72920f755c1132
Author: Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-07-15 16:45:24 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-03 16:50:41 +0000
vmimage.subr: fix typo in checking NO_ROOT var
Reviewed by: imp
Fixes: 08b497dc6c4d ("vmimage.subr: Support NO_ROOT pkgbase")
Signed-off-by: Siva Mahadevan <me@svmhdvn.name>
Pull-request: https://github.com/freebsd/freebsd-src/pull/1867
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 65e2ce55b662447fb4e87246262c07bf5a25efe9)
---
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 27cca78be6e3..3b0519c21dbc 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -95,7 +95,7 @@ vm_install_base() {
pkg_cmd="pkg --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
+ if [ -n "${NO_ROOT}" ]; then
pkg_cmd="$pkg_cmd -o METALOG=METALOG"
fi
$pkg_cmd update