From nobody Thu Oct 23 22:41:59 2025 X-Original-To: dev-commits-src-main@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 4ct1HX1jVTz6Dkkr; Thu, 23 Oct 2025 22:42:00 +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 4ct1HX1HZ4z3K3s; Thu, 23 Oct 2025 22:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761259320; 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=AX4RUhlhYjpkkShd+4eMlr1/PNsbg2CaBgcnQ295WKM=; b=t8zPnUE2h+wonONy2WRAj/ZUm5LIFLFTfFZtGUIwGK5quExxmDQE4JXkpynqyB9UpfsA+q /vrMuzQdcMBzRTIQKgknElt16y5m8efrLW20CqJWuO/j/qOeelXHDl0pVaIh6O3DzhAQzZ /Q70qUSm4aA32IwWz/z/eRnLfovVmp7A3Xg96qArkAOrGepzglbbSgrMGtcbCjkjMoXMeq w5hKHS6KyXM+87fMYm7tgfu/OhUi90Na/ESbYtZXAXvJYbqOjKAx0DWNN7j8EU+ADl/UFH oqNa0f9u5xsbpD6fJmKeBIyAXsj+NKPOrLz2z5BYE82cpvCjt+AB2U67tplg/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761259320; 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=AX4RUhlhYjpkkShd+4eMlr1/PNsbg2CaBgcnQ295WKM=; b=tzA3Bnfa0BNBeMqBkFI2M2yJHKleaM4hIGGG+N7BaeQZ9c6MgrTplOJ80JjPDusZb0z7ro jGL3Nt1gB2PZPHNqGB4iGFDdRW7IytI8ycj3dwhQ4mZjFSaVay2HC3R4X5KXu2nYvO02Ea IzGjMpOXa/IhjISklXNFvfvgxypMqKDL3fVLjWXFctUCr1r2xjA3PkfiqepxIbI6+Ulv4D ZEhD19hLK9qOBS7WzfcUWKpTbgglaAQ0Rsftrr0YtnQsUuacsqQax3vt+ferg3PLsb4HB5 RvWBqMs+xbFlRtQjs5TWW3I7FkKw65EvKQToIy411HR4JBhIyqPBY74sQLIDwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761259320; a=rsa-sha256; cv=none; b=xik7eD/gAX+z3buehuLy5BEzjRD6SJzwhlgjDLON+ek4UHvIH5qdaOkdNVEEFcsPWwPenT PWX4q4Iqw2+s2uXVA15QqhK+43tCwBg9yzh8DG68Flog2uvrkphHLmeZCbjnqJNLe0riXe qSSbBzydOfvGQRKdNF7Ewqy2WOX4I0IEvsKTk8CNnGjuTGHxZOLsil+kHQzjpsqodTuBVC hzk67+qDjzNLVAtmYSXXFj7RnZJ7/EBUvczu4R5FfpS3KceGcx5dmVAGQXowicrxTThkqX xhKJsDbh28jHvP13sNVKacQRUbhgMTFRV8YQDJuI0OEI8OcRsFhXLdxLelCbBg== 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 4ct1HX0fbfzbTs; Thu, 23 Oct 2025 22:42:00 +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 59NMfxkr029799; Thu, 23 Oct 2025 22:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NMfx4b029796; Thu, 23 Oct 2025 22:41:59 GMT (envelope-from git) Date: Thu, 23 Oct 2025 22:41:59 GMT Message-Id: <202510232241.59NMfx4b029796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bbe65c5e8c0e - main - release: Use PKG_CMD when installing pkgbase packages in vmimage.subr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbe65c5e8c0e89ec14cb5d00153691850dadb859 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe65c5e8c0e89ec14cb5d00153691850dadb859 commit bbe65c5e8c0e89ec14cb5d00153691850dadb859 Author: Mark Johnston AuthorDate: 2025-10-23 22:21:11 +0000 Commit: Mark Johnston CommitDate: 2025-10-23 22:41:51 +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 --- 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