From nobody Tue May 12 22:28:14 2026 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 4gFWSz48Vvz6dCT0 for ; Tue, 12 May 2026 22:28:19 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFWSz3cDMz45wK for ; Tue, 12 May 2026 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624899; 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=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=KYoyAV2cN3a3R2aRQ3IICK/Wp5s8wsbM1X4gCFaMe+Xax8gTlA/zOA2bfbvzutu6WpkK8s 77ENdfGLyaGc6+IhqeWo5pkUnYkcmKkREh+DsQgQOdwVpCPX2dElPNo01uq8S0VSno+utS /RYViDgl1rOpGgZNS+df+THsbDa3Msc2xZn5Vy6yFcIU2K0uroA6+Ea/wzQzUV96NZKgTt cDDM2skX4KK9h9ogefs7IzYZiA/8ftB9xDCUk2ZkrYsO+iEdY1FB9GR+Kp9bSeGyzOyqud b+ibsJrp4kTGNVgTAf6su46dKzRp6CIcWsLPsEws18sGboE2E6BkYVcxOCsXgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778624899; a=rsa-sha256; cv=none; b=o0hyixIRUQUwcghC8b6HskEqHzM/zFoI6jdFrbzy6f72VhBh4iApXRpa2HVevwlFxlF8vf nRNOHbv66Utn6WsUwCPf8xMc3ONCH56MEGzhp7CdTq8s30V/pu/n13IuSdEB2et60Lr7Lu rui6za9UMPF95Fthow8WJrAlxWNcpjBCjuJDDH9rIfGttmYaL6vu9jgUzWU71BMFI6i00c 5X2S2Pbbysfq7wpjYAP2uiZYYVGx8gE00UZQhDk1Upj51jOqUhlOCrch5x49Zhpr8FN5Fy FfPbg/0iigx43GhKegpdTwXEemN/HmXlyOJpmxewfiltcWiJ/zMh0XnIXE/ONA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778624899; 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=OlXNCZLHjLtVgEdN1PJ/TCiOt81MpFu9u2vl2PXEnTs=; b=iMjdPg/BaSed0pQzUeFIMDExc02qzdl7uxtLkR7oQG64pP6CUZwlA1swou6KCa8/Zsk5Ra vdB7SB91yiPV3Ic7+4e1eg1fJjrHi7MZ6BUPdJx+BhGRa6rFc3d3rrT0D7Bt/r4igeUIX2 1e0tfRgoihBFyQnLWymcUddtTQda92YU6/pdJ55wg24OckzKl3Pp7q+3UxV+p9WyQyCCf+ UffQIpm+uRK+/+ZBKSxIhcCT/yaIhI7KiWCVpfesxmmKrm3g+fninVxGCGQyxlDJPpzNZD 4E88AJU5T2l7hGhikFIY3el8SqZCeE7B/nlrDRZ6nPpI+pZgWcXXB3DmyADPXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFWSz33hSz7WK for ; Tue, 12 May 2026 22:28:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 399ec by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 22:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dave Cottlehuber Subject: git: d889f6c466d4 - stable/15 - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d889f6c466d4cec73c34bc71093d08b25e321071 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 22:28:14 +0000 Message-Id: <6a03a97e.399ec.7290eca8@gitrepo.freebsd.org> The branch stable/15 has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=d889f6c466d4cec73c34bc71093d08b25e321071 commit d889f6c466d4cec73c34bc71093d08b25e321071 Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Dave Cottlehuber CommitDate: 2026-05-12 22:22:57 +0000 release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf Instructions in /etc/pkg/FreeBSD.conf and elsewhere recommend putting changes in /usr/local/etc/pkg/repos/FreeBSD.conf so bring OCI containers into line as well. Reviewed by: dfr, ivy Differential Revision: https://reviews.freebsd.org/D54090 MFC after: 5 days Sponsored by: SkunkWerks, GmbH (cherry picked from commit c73ae67348998a0056145e88debbea9ff6860c4f) --- release/tools/oci-image-static.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/release/tools/oci-image-static.conf b/release/tools/oci-image-static.conf index 8e642d9defce..e2231d951268 100644 --- a/release/tools/oci-image-static.conf +++ b/release/tools/oci-image-static.conf @@ -36,12 +36,8 @@ oci_image_build() { ;; esac mkdir -p $m/usr/local/etc/pkg/repos - cat > $m/usr/local/etc/pkg/repos/base.conf < $m/usr/local/etc/pkg/repos/FreeBSD.conf <