From nobody Thu Oct 30 04:23:35 2025 X-Original-To: dev-commits-src-branches@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 4cxrZw3VpXz6DjX1; Thu, 30 Oct 2025 04:23:36 +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 4cxrZw0BDTz3FhS; Thu, 30 Oct 2025 04:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798216; 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=K7lVPeutVOeLU6Ft1TwZ8mS8jh+lZkOYG3wUdTKx2T4=; b=IN6r93wezacvKZ5rJS5XlKrXP0O6K5/26MUiwggS/NWj85A1Xoh+rKeaXxoTEZBpF/+3sT 95t6033+BJRlw9+0QP7lYN5mrMGfaDuuJeneZtUkD60svqUC3sGkk8q0LQqA+kqHIN7yHn i63GCzEwyIaae6Mfp/gpefq7kjyCOyLezeAiWIs4ExENrLwxuuHGL/TM82nA51BiT2eHnY dNvZYDDVz7EanOZ4I2dnx0IHVCdQlB4sjJCrN3czcC6vzSDEWusW4B4DThY1Tdp82g3RdU 6ziyNSZsa3biSJYa1uAHUxSTeIrt7tAbqioocVQ58eJYYO+CN1dwTzYac/yhYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798216; 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=K7lVPeutVOeLU6Ft1TwZ8mS8jh+lZkOYG3wUdTKx2T4=; b=xN1PZ/L0okTRoOz1mspw3D/vDjhH4exze/VOTwwyta7U+6GuU0bgsicc7M9Rx/0AOGg5sy 5tvs27CqnzfcD4UbQf6llTKafZ/cdY05T2BCvvYJVZfLFm+oDwIejiZFlmmbC8MZaSszaT 1yBgN0T2iiWAJ9l9W2HNPgyAwn1qnijrxDoSLROpswrK5aNt/az2rNRuGwMnS0j54sNA3E 5v+8crnjRtmOJ0Hny996X3bapuHiNkmZtoA7lICbpJtmsfyu6pLp84j6+NHQST8zpirxg3 B5SErMYyAveoxej5JepkztMQO9/T6CfujvklMQroEJJ5hIwohK6M1qRHN2SzbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798216; a=rsa-sha256; cv=none; b=JXgic7FnBfxQC1LRQuXlhCSk+Y7pmSsiRsrMgrUZuTQ+tPtZ0GaXJrRjrH1ScFNteBoFDr TQrx9Eekb/e4Sx9OD4sw1crsxHY3ZeYbCb/4H0KykWXUJ5f+BAS3IBajY/NUE4rZxha6CT fNSmb3ibARVOBhcYzNZpAM0wmQ53MP9FuWICwLD/RF0+5Jy1XLrkII5nkktei1F2BVsduq 1paMpgs0OLvIkOG/g1MLTcvtF6jLnpE4cQaLJHqUMZUVjMOBmfIVaCeYTQDiQQvrTrfSb8 QqQeLDMAv81UIzKqaHT0md+hw5YOpgpTbZY4YMbGEAbigELXQS9IZLsxDbz5AA== 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 4cxrZv6thvz16J4; Thu, 30 Oct 2025 04:23:35 +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 59U4NZCi084187; Thu, 30 Oct 2025 04:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NZBN084184; Thu, 30 Oct 2025 04:23:35 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:35 GMT Message-Id: <202510300423.59U4NZBN084184@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: c40e634e6a5f - releng/15.0 - release: Use PKG_CMD when installing pkgbase packages in vmimage.subr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: c40e634e6a5fd443fac0c0b26328900fdd2a4610 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c40e634e6a5fd443fac0c0b26328900fdd2a4610 commit c40e634e6a5fd443fac0c0b26328900fdd2a4610 Author: Mark Johnston AuthorDate: 2025-10-23 22:21:11 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:22:23 +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. Approved by: re (cperciva) Reviewed by: cperciva MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53307 (cherry picked from commit bbe65c5e8c0e89ec14cb5d00153691850dadb859) (cherry picked from commit 79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc) --- 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