Date: Wed, 20 May 2026 19:39:53 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> Subject: git: 081a9e933033 - releng/14.4 - freebsd-update: Skip /etc/ssl/cert.pem Message-ID: <6a0e0e09.36578.13c7983b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch releng/14.4 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=081a9e933033a950e615ec8f7200277f9b97c75f commit 081a9e933033a950e615ec8f7200277f9b97c75f Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2026-05-18 16:22:04 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-05-19 23:49:37 +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. Approved by: so Security: FreeBSD-EN-26:13.freebsd-update MFC after: 3 days Reviewed by: cperciva Differential Revision: https://reviews.freebsd.org/D57028 (cherry picked from commit 2509ddee9bdb2240ba2f622e3a55a98ebc2aa4ae) (cherry picked from commit 7d9c1d3895b307085131f922d7e46a4812f04675) --- 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 1e9e6e63e992..5d52eb285fe0 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -2523,7 +2523,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}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a0e0e09.36578.13c7983b>