From nobody Mon May 02 18:39:01 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 651741ABDA4B; Mon, 2 May 2022 18:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsX1K2Csxz3tPX; Mon, 2 May 2022 18:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651516741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjWsVde0eUh7K+kqinbR01OE+MEiYmLv8c3fMmfu4oM=; b=bj2e/GI6k1keszBDOfqZVcq7xyVXEImLVjNZf1Ok8ZEtdht4P6cWDzM8I36e2UZtdnn6Hn 4O4DJNYpQH+sEpi+Lld1R0vl+K7y+j1Q6qS8JULd+aVW1yB9XVHLQRu7UZHu17GIGFqavd XnQwds64n7Gdufs1GAFbhsNSKOW3UMn5i61mWBmcWBFDxIKMMcV+x3K5YyMHjzb7n+5DWU jsDKl1Xq29ZZ1SbvKY/JMHchTB1a1YMPcgHzjO9/fnUCP0TWdlVHqR5DaKbkB996d9rwRa CvwRjur7Tu4aubBR2kOMGSGROopI2DsGlHBaovTIWOZBdknN3ZhaGq3EMMgUkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25CAA71AC; Mon, 2 May 2022 18:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242Id1S9000558; Mon, 2 May 2022 18:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242Id1Vn000557; Mon, 2 May 2022 18:39:01 GMT (envelope-from git) Date: Mon, 2 May 2022 18:39:01 GMT Message-Id: <202205021839.242Id1Vn000557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6cd1bc531609 - main - freebsd-update: restart sshd after upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cd1bc53160973fc421c59f66aaa7e4b37a8cebe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651516741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjWsVde0eUh7K+kqinbR01OE+MEiYmLv8c3fMmfu4oM=; b=Tupemn1p7VlEWsAyCAG2etkP0VBa8fqG0WyxSZ2uaI3Bh/pNXV6C0d9e0kl/nYu6FezSpR YVDhaT3AH3RPq4BspedbdkCcessXPRt029qNQ3d8NJtYZYd+LybViytLnNqgLwpIOtAaOf 5DALxLi7XP6E6IIff3pTYFeUNyCk67+isHec1P4C70zW7+hg33fFPNLP7Hb4tzY+XQca7V zPHNiNN5vaEqIR8ki+3sO6xWCB7qvIbWr/BpwwG784rTyRuyjHwnzsZbaOpV1igP2pR8qE FjrJ8u//DjSszxGs7s7dGAvC/YPmSxg6HI6xV7uPL+mw7/vm/A2T2oGH3ArGGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651516741; a=rsa-sha256; cv=none; b=C83bOHNlMKJidP4ZcP4aJhhse66PhY+N7HhKE7sKMu1NxG+EA6DS/bqixeReV466r2Syae RdVwS3aMxKeBbhYl7GoCSm1Qo48sFj/cHv6ejJRLlfoTshfUOZdMXRGUeKvJC5F/bfyChg qoZiEtkjd78Y4Qy5jPdfJWWSaSCHsTHUBpQYMVVLxMg15ICqWGDC3i9oPthtJGbSem1pic KFcVwvECObjztc41IEIXSoWFEn1ofE2Lio2vqqOEyg1LkdhzHq0xUXV4sL/A/m9RuNtSak ePStKZV89eoZoop1Xh1UuOtzNjdqMLEGf7lkc+warZaHXcHcNyyB9Lk3xAiFAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6cd1bc53160973fc421c59f66aaa7e4b37a8cebe commit 6cd1bc53160973fc421c59f66aaa7e4b37a8cebe Author: Ed Maste AuthorDate: 2022-05-02 17:16:19 +0000 Commit: Ed Maste CommitDate: 2022-05-02 18:38:19 +0000 freebsd-update: restart sshd after upgrade Sometimes the parent-child sshd protocol changes during an upgrade, and when this happens sshd will not accept new connections until it is restarted. PR: 263489 Reviewed by: kevans, gjb MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35109 --- usr.sbin/freebsd-update/freebsd-update.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 9743cd652d16..078043326115 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -3023,6 +3023,14 @@ 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 + echo + echo "Restarting sshd after upgrade" + service sshd restart + fi + # Rehash certs if we actually have certctl installed. if which certctl>/dev/null; then env DESTDIR=${BASEDIR} certctl rehash