From nobody Tue Jan 27 22:55:34 2026 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 4f112v61Dkz6PbT4 for ; Tue, 27 Jan 2026 22:55:35 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f112t4MnQz3Jpg for ; Tue, 27 Jan 2026 22:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769554534; 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=eQaLyPW8TywkA+Y3zSDyj2TpRQgUcJVNb7g4o+knLfw=; b=HJUlnl4H9EBj6YD60mDx2Sf2rRtbiNqr+8CifuiNaGGeAT3ocJOXJW0Zei0bPLt39Azt59 sIUQiW5d5TYd1CISHYpI0tXMxq4w4NhECWtLCxIhzNfddy4YI1pbV8qX/jqfMnelZE/Arq XTp+jvgFJXIRr8yhkSwjI4PUdgWImFjz2LSeILLEqNQ02Y6eTh7yx6Ji8m7r2q9i68sv++ KFzPzuCRBNPZx4g3xXNAiU4F9w67FL5O9nde47CPz5FhIQyje/wZXL94qcbvzyxkXnA4nB voUVEjo/wZqqhDXdODY5E6EMqj6XIWGYXrHQbMRcBD4055etl6Te0E6okFhdTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769554534; 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=eQaLyPW8TywkA+Y3zSDyj2TpRQgUcJVNb7g4o+knLfw=; b=aOrD4oTWudsG/r5bz4W3YCNfDANPGXMZWXdrYKS5k2pMCrP6HRQIVu5NCxvxp9A3R3uoFB jlCbvGTEYjvWvs2Hswd1V0dRKmAsUFnCTTyCAMiTyUeEm8AE3pVaBJ7O+ORaEvzXtjjsow W/VybWWnfpTcQqtThJRh9S9lMLPQURRpAWvHZwh34U1YH6hlfp6LxgiqPq/O3KCnW0PEJ/ J6bHSuU/2qxx47VrWJdDSKTtuxXWM0mbPpvd3NDSkSx8qqSOrodkXWkg5p92Q4bUswe+zt 5zMNY+iGWpUyCjEOPPYVeaWF1vmAjuwIs/0d7QULC7af0t2uT5s3A0qRJZ3HAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769554534; a=rsa-sha256; cv=none; b=tt60zywG00JmUYcdQrEvIVWJagV3z4PpIolqbhOgq26Km3AZqdqkmDfDNu/hUdAkbJp0xv Ii4fkOHi/zRchk9Yu3yjRYVEEbeA+otDOinKI4EpjovH80fLZOKOw0IldobILgj+FDHnoz xcHT9eeH1orc2OA6TbE1tFvriOmYxgVhSDCeJMjZiG+7HKaNYLSjkDvGr+HPzszj6F74et uGYUg+E4vdmIyU5jfRV9O69SRX1kcR0W+hY834JBYClM0WVKonFg29ne3ieR/dDifdOF5V FUAQYJQcxxg4icw1D3MykjOdhcXBcMoleIBZqSc+Qxx4Vimr442bZlEa3ML8YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f112t3zBHzBDg for ; Tue, 27 Jan 2026 22:55:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40f98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 22:55:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dave Cottlehuber Subject: git: c73ae6734899 - main - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf 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: dch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c73ae67348998a0056145e88debbea9ff6860c4f Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 22:55:34 +0000 Message-Id: <69794266.40f98.5dd3e55c@gitrepo.freebsd.org> The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/src/commit/?id=c73ae67348998a0056145e88debbea9ff6860c4f commit c73ae67348998a0056145e88debbea9ff6860c4f Author: Dave Cottlehuber AuthorDate: 2026-01-27 22:51:22 +0000 Commit: Dave Cottlehuber CommitDate: 2026-01-27 22:54:44 +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 --- 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 <