D57028.id177919.diff
No OneTemporary
Actions

Size

781 B

Referenced Files

None

Subscribers

None

D57028.id177919.diff
View Options

	diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
	--- a/usr.sbin/freebsd-update/freebsd-update.sh
	+++ b/usr.sbin/freebsd-update/freebsd-update.sh
	@@ -2587,7 +2587,7 @@

	# 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}
	@@ -3170,7 +3170,7 @@

	# Rehash certs if we actually have certctl installed.
	if which certctl>/dev/null; then
	- env DESTDIR=${BASEDIR} certctl rehash
	+ certctl -D${BASEDIR} rehash
	fi

	# Rebuild generated pwd files and /etc/login.conf.db.