freebsd-update: do not restart sshd when updating jail/basedir

In 6cd1bc5316 for PR 263489 I changed freebsd-update to restart sshd
after upgrade, to avoid an upgrade-related incompatibility that made it
impossible to login.

This is intended to avoid losing access to remote hosts, and ought not
apply to upgrading jails (from outside).

PR:		263489, 272282
Reported by:	otis
Reviewed by:	otis, kevans
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
Fixes: 6cd1bc5316 ("freebsd-update: restart sshd after upgrade")
Differential Revision: https://reviews.freebsd.org/D41890
This commit is contained in:
Ed Maste 2023-09-16 21:46:16 +01:00
parent b15f640037
commit 8ee97b1928

View file

@ -3036,9 +3036,10 @@ Kernel updates have been installed. Please reboot and run
install_from_index INDEX-NEW || return 1
install_delete INDEX-OLD INDEX-NEW || return 1
# Restart sshd if running (PR263489). Note that this does not
# affect child sshd processes handling existing sessions.
if service sshd status >/dev/null 2>/dev/null; then
# Restart host sshd if running (PR263489). Note that this does
# not affect child sshd processes handling existing sessions.
if [ "$BASEDIR" = / ] && \
service sshd status >/dev/null 2>/dev/null; then
echo
echo "Restarting sshd after upgrade"
service sshd restart