From nobody Mon Sep 18 09:50:13 2023 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 4Rq0QY3lSYz4stnn; Mon, 18 Sep 2023 09:50:13 +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 4Rq0QY2Bb1z3STV; Mon, 18 Sep 2023 09:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695030613; 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=PUn8Oo19Kr68+7GB8qdzvRQPK7hLDNAQpCKSB3V8FR8=; b=RJ/p37JYVNZRrcPVMbVpQePjOOlJ2L5QBhuuNeWurApqyWXV5tQWtjapUpei/MvaTJDLi/ smosAnsPilXoWXTxSb43Pcy2YiFxmFhRx/9cxZodpTxHiMzavQxxXI3FZLq7Sy4vAdBmWB Z12PHO1Uf7JEV4HNYFqG55kUYEMcicv3Dp3l73yGm0idzEGz7KIiKb3dDDRjQqbaH+uJS/ tO97Tw2OUAXsFIWjYmWocmgu/rj7rbloJhj7XqcucJKyTYPyaU9H8W+ZYFK+nw+Gij0wla 9FYwUK8UlCYxLA4FwNNnb6CuMaf2xPlN3ouAVhwthxvVDltSXAM98HqoSDXgGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695030613; a=rsa-sha256; cv=none; b=kWVtGgDjFzRrhWLYqLi9Z/wAnLRoQ4YszJx6xZMOG9Ldey+xBSE+FbNm3lq+9gRNB8MERi YOu3UTLjD8o02VnDjt0FMq8Cxthl7tzaF+yW2ThsctuEB/ZpxaNABWV1PneCzeSd9CqLaS Od0hLW8Bs7NyMtkko1yMwH49mG3SoLd5r8jk6L4hTnlNo0v8O4kbrbKlT7K6qdnuXmQ/e9 tfwnZDvo7/TgWstNlzKy+7ukqeyDfc2ZrOvmiN44mOasWPLCWVfiXzmloDg6wg8Y4bRcjF VJWbnWzYDmBQlVPpc9l3/NI8cDS0cWjqUvwD8xhc6a6PXUtiWZF7GCsIqygJJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695030613; 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=PUn8Oo19Kr68+7GB8qdzvRQPK7hLDNAQpCKSB3V8FR8=; b=lX7Tu8oNYljl+5VrP2C2YDccxacGAL2rnn1QOt2xV0LTq9Qgk+foaY8mJGnIMUVcPZUYNU IKvKOLutA82Q92MmXVCX7h7n6bythiEijBjrb/hA0wjO9LcjiLESPxYrQVB402pHnLCsav 5+PxuMbfzyykw9U0dneec+vMQLMlN8GhEiST6hMO5LJRFXXjynoUl0NeMSo0BkRvcpMMhQ JLlv/JPM15HcuQ8a0G8rw5u928XNxSrs/YYMbqyoBBrMww12x0hW74wGU2chEwNkxWky5u /lfVqoRVmRVduJzlE8AmWhQ9Bu7Y7VJ77vJwzC6NpQoD8+qmvCzzN/9ETzlkUA== 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 4Rq0QY1JgVzB8h; Mon, 18 Sep 2023 09:50:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38I9oDq3036515; Mon, 18 Sep 2023 09:50:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38I9oDec036502; Mon, 18 Sep 2023 09:50:13 GMT (envelope-from git) Date: Mon, 18 Sep 2023 09:50:13 GMT Message-Id: <202309180950.38I9oDec036502@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: 8ee97b1928e7 - main - freebsd-update: do not restart sshd when updating jail/basedir 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: 8ee97b1928e75f7f81a870ffb063010778e0a129 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee97b1928e75f7f81a870ffb063010778e0a129 commit 8ee97b1928e75f7f81a870ffb063010778e0a129 Author: Ed Maste AuthorDate: 2023-09-16 20:46:16 +0000 Commit: Ed Maste CommitDate: 2023-09-18 09:47:01 +0000 freebsd-update: do not restart sshd when updating jail/basedir In 6cd1bc531609 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: 6cd1bc531609 ("freebsd-update: restart sshd after upgrade") Differential Revision: https://reviews.freebsd.org/D41890 --- usr.sbin/freebsd-update/freebsd-update.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 57023557839b..9cdff05c24e4 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -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