Comments: FreeBSD.conf should not be overwritten

cndghm · bsdimp · commit 849c0eb07028 · 2026-01-09T19:41:13.000-07:00
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: #1925
diff --git 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
@@ -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
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#`
`2`	`2`	`# To disable a repository, instead of modifying or removing this file,`
`3`		`-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:`
	`3`	`+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:`
`4`	`4`	`#`
`5`	`5`	`# mkdir -p /usr/local/etc/pkg/repos`
`6`		`-# echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf`
	`6`	`+# echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf`
`7`	`7`	`# echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf`
`8`	`8`	`#`
`9`	`9`	`# Note that the FreeBSD-base repository is disabled by default.`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
	`1`	`+`
`1`	`2`	`#`
`2`	`3`	`# To disable a repository, instead of modifying or removing this file,`
`3`		`-# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:`
	`4`	`+# create or edit /usr/local/etc/pkg/repos/FreeBSD.conf, e.g.:`
`4`	`5`	`#`
`5`	`6`	`# mkdir -p /usr/local/etc/pkg/repos`
`6`		`-# echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf`
	`7`	`+# echo "FreeBSD-ports: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf`
`7`	`8`	`# echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf`
`8`	`9`	`#`
`9`	`10`	`# Note that the FreeBSD-base repository is disabled by default.`