git: c73ae6734899 - main - release/tools: use same pkg settings in containers as in /etc/pkg/FreeBSD.conf

From: Dave Cottlehuber <dch_at_FreeBSD.org>
Date: Tue, 27 Jan 2026 22:55:34 UTC
The branch main has been updated by dch:

URL: https://cgit.FreeBSD.org/src/commit/?id=c73ae67348998a0056145e88debbea9ff6860c4f

commit c73ae67348998a0056145e88debbea9ff6860c4f
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2026-01-27 22:51:22 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
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 <<EOF
+	cat > $m/usr/local/etc/pkg/repos/FreeBSD.conf <<EOF
 FreeBSD-base: {
-  url: "https://pkg.FreeBSD.org/\${ABI}/${repo}",
-  mirror_type: "srv",
-  signature_type: "fingerprints",
-  fingerprints: "/usr/share/keys/pkg",
   enabled: yes
 }
 EOF