git: adf56b3107c4 - stable/13 - freebsd-update: Skip /etc/ssl/cert.pem
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 May 2026 14:00:13 UTC
The branch stable/13 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=adf56b3107c41654056ba08d612700875438294c
commit adf56b3107c41654056ba08d612700875438294c
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-05-18 16:22:04 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-05-19 14:00:07 +0000
freebsd-update: Skip /etc/ssl/cert.pem
We already run `certctl rehash` at the end, there is no point in asking
users upgrading from 15.0 to 15.1 to manually merge the trust store.
MFC after: 3 days
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D57028
(cherry picked from commit 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae)
---
usr.sbin/freebsd-update/freebsd-update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index e1712ff8b356..29322e864068 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2508,7 +2508,7 @@ upgrade_merge () {
# Some files need special treatment.
case ${F} in
- /etc/spwd.db | /etc/pwd.db | /etc/login.conf.db)
+ /etc/spwd.db | /etc/pwd.db | /etc/login.conf.db | /etc/ssl/cert.pem)
# Don't merge these -- we're rebuild them
# after updates are installed.
cp merge/old/${F} merge/new/${F}