From nobody Wed Oct 29 12:50:31 2025 X-Original-To: dev-commits-src-all@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 4cxRtH4gCzz6Dfcj; Wed, 29 Oct 2025 12:50:31 +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 4cxRtH2kCHz4JT0; Wed, 29 Oct 2025 12:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742231; 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=fD+wbOMjqjwQNIr67OHruY9/4cH3WBn9GmoLdoKZ8HY=; b=BXY2nU2nMbgroc7Yb+RxPWwH4tpo0pUQfuegZ9WmmxlTmAtBZToZOp2SKt729Mm4nEJpfO Wb97Bhe1TAz2oQtHTIHfCVWzyuEtD4Z/0M5C+04KzCTFNQngrg0t/6bcA6CKHX2b5XzUuN 2I6TMilwFSsdHg4jtEY7VfXaF6W2wPJntYvHEkMGv8j88GNU03eF3P+wRwWQSjCR0ooxvV x7VflhCHsz8dsp4npqbJou4/MKHp4+xOJ/ZUFxBn7zd21N8RDu01S9IdNkK/RjwggMvIt5 2p30cc/1KA8JNlEepUy6aEglr9FuPAmnogRNy8+QNMDW94382TtdnBOh0ZStJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761742231; 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=fD+wbOMjqjwQNIr67OHruY9/4cH3WBn9GmoLdoKZ8HY=; b=lhJncZ9rNEDVVdAtB4FDx7WngJrWRL5/IDY8bdguFrDb5FXq2N74ja/FMA4QY+wC6HJ0bm PMB3gUg14Rr67BpVrAFyLUJys5zJRaYbitnJ5oer4V6Ljo3N1XTpErMistukSJaBSzuD4a 1hllLrZas3yHuQE4F60Rcxi9W8cbkrjs0jWdz4SmzmRuR9rNh5VRY3zPr1vm0SK8nqBZz3 PAeNyIbq/26TWxfNtboQU/IHKgDUxC4ZqnmoOF2wNfiaERiYa6kFu37BrXM630PQN6ZIU1 jc46kAizIBHfOgebRq85oTtTmAoqcnkUiz34yEWTvQwu3FnuEGvyjux0KOSvEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761742231; a=rsa-sha256; cv=none; b=SMRWapYNv3XKA89/jI1T15WEnhzdnBRxclUpDFlVwAEaVY5KBSF4zFCgABQuzZqidXr4Cr tX5El6FUjATpkZowEez+WwImPKbovCVazVr1Jftu0ScHYLgIfB6exCU4DGlYlHWvCEQuQH qjxnSmtBlsMjK/4GIHD7r8ZGe2+cmF3By4jJKXrz3zciLh36T/czOlnFxh01nsHl3HGB+s pAMB7TAcYyiOkKPLUwbYHLqu8rlo6UQiKLvnb3PQMEeMOid47LCsS+7fsSxlmSwsBoPWeS VoMRaHvppf4pH0gUC9Xj+LwpAXEOpeUgj8Lz9ydaTOsmmwqB1A1siFqz+vD1lQ== 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 4cxRtH25kdzd6l; Wed, 29 Oct 2025 12:50:31 +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 59TCoVXw021256; Wed, 29 Oct 2025 12:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59TCoVuW021253; Wed, 29 Oct 2025 12:50:31 GMT (envelope-from git) Date: Wed, 29 Oct 2025 12:50:31 GMT Message-Id: <202510291250.59TCoVuW021253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 79fbc4ccb6c6 - stable/15 - release: Use PKG_CMD when installing pkgbase packages in vmimage.subr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc commit 79fbc4ccb6c650db5c0d6c72e5e4a682e4600bbc Author: Mark Johnston AuthorDate: 2025-10-23 22:21:11 +0000 Commit: Mark Johnston 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