aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2025-09-04 21:49:46 +0000
committerColin Percival <cperciva@FreeBSD.org>2025-09-04 21:49:46 +0000
commit45d3204dec88baee5d6da2890f90fe2c491e9e2a (patch)
tree52adeb20f8a0a88d6dee1afbe159e0ba7d732fcc
parenta8f6e2b5e46a71cc6d3deb07baac4707a5ecd81e (diff)
Remove cached FreeBSD-kmods repo from cloudware
This is a direct commit to stable/14 but corresponds to part of 778bfd4e1033, which both chased the renaming of repositories in /etc/pkg/FreeBSD.conf and added cleanup of the FreeBSD-ports-kmods repository database (which is just "FreeBSD-kmods" on stable/14). Fixes: 8a2ce9f9dd67 ("pkg.conf: Use kmod repositories")
-rw-r--r--release/tools/azure.conf1
-rw-r--r--release/tools/ec2.conf1
-rw-r--r--release/tools/vagrant.conf1
3 files changed, 3 insertions, 0 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 519ab13fe432..9e698b93fa91 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -28,6 +28,7 @@ vm_extra_pre_umount() {
chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
/usr/sbin/pkg delete -f -y pkg
rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+ rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods
chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index bac8bb0d0e67..c0561227f72c 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -28,6 +28,7 @@ ec2_common() {
/usr/sbin/pkg delete -f -y pkg
umount ${DESTDIR}/dev
rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+ rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods
# Turn off IPv6 Duplicate Address Detection; the EC2 networking
# configuration makes it unnecessary.
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index 2735ad2974cb..2fc21911ce17 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -21,6 +21,7 @@ vagrant_common () {
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+ rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-kmods
# Vagrant instances use DHCP to get their network configuration.
echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf