git: 849c0eb07028 - main - Comments: FreeBSD.conf should not be overwritten

The branch main has been updated by imp:

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

commit 849c0eb0702879d7cd0fdec589aac048b691b2ab
Author:     Guilherme Augusto de Souza Candinho <cndghm@gmail.com>
AuthorDate: 2025-12-13 22:55:28 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2026-01-10 02:41:13 +0000

    Comments: FreeBSD.conf should not be overwritten
    
    The files /usr/sbin/pkg/FreeBSD.conf.* currently set base repo to {enable: no}.
    We don't want to overwrite /local/etc/pkg/repos/FreeBSD.conf that already exists
    when users choose tech preview in the installation.
    
    Signed-off-by: Guilherme Augusto de Souza Candinho <cndghm@gmail.com>
    Reviewed by: imp
    Pull Request: https://github.com/freebsd/freebsd-src/pull/1925
---
 usr.sbin/pkg/FreeBSD.conf.latest            | 4 ++--
 usr.sbin/pkg/FreeBSD.conf.quarterly         | 5 +++--
 usr.sbin/pkg/FreeBSD.conf.quarterly-release | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/usr.sbin/pkg/FreeBSD.conf.latest b/usr.sbin/pkg/FreeBSD.conf.latest
index f4b80c02cffa..0b6570cbd798 100644
--- a/usr.sbin/pkg/FreeBSD.conf.latest
+++ b/usr.sbin/pkg/FreeBSD.conf.latest
@@ -1,9 +1,9 @@
 #
 # To disable a repository, instead of modifying or removing this file,
-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:
 #
 #   mkdir -p /usr/local/etc/pkg/repos
-#   echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 # Note that the FreeBSD-base repository is disabled by default.
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly
index 117bbd49aeae..4579bb6d8395 100644
--- a/usr.sbin/pkg/FreeBSD.conf.quarterly
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly
@@ -1,9 +1,10 @@
+
 #
 # To disable a repository, instead of modifying or removing this file,
-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:
 #
 #   mkdir -p /usr/local/etc/pkg/repos
-#   echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 # Note that the FreeBSD-base repository is disabled by default.
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly-release b/usr.sbin/pkg/FreeBSD.conf.quarterly-release
index 47183d41dc6d..e2f4ddf2d878 100644
--- a/usr.sbin/pkg/FreeBSD.conf.quarterly-release
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly-release
@@ -1,9 +1,9 @@
 #
 # To disable a repository, instead of modifying or removing this file,
-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:
 #
 #   mkdir -p /usr/local/etc/pkg/repos
-#   echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#   echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 # Note that the FreeBSD-base repository is disabled by default.