From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1648653-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 584E015802E for <garchives@archives.gentoo.org>; Mon, 1 Jul 2024 10:37:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43F35E2B3B; Mon, 1 Jul 2024 10:37:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7442CE2B3B for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2024 10:37:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E5E8335CB4 for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2024 10:37:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC77E1DA2 for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jul 2024 10:37:15 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1719830208.1f9842efa122bc2fa6db472a42ef9772f290cf9c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-9.8_p1-r1.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1f9842efa122bc2fa6db472a42ef9772f290cf9c X-VCS-Branch: master Date: Mon, 1 Jul 2024 10:37:15 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ea89d22-1ba2-4f10-a470-f737ff3e3d14 X-Archives-Hash: 387e9d1d1d687ac75eacc50f8e7de6d8 commit: 1f9842efa122bc2fa6db472a42ef9772f290cf9c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 1 10:36:48 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 1 10:36:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9842ef net-misc/openssh: explain why we don't need to do `sshd -t` for the OpenRC case ago pointed out that it's confusing. Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/openssh/openssh-9.8_p1-r1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-misc/openssh/openssh-9.8_p1-r1.ebuild b/net-misc/openssh/openssh-9.8_p1-r1.ebuild index 9a15dd231570..6633e212c19c 100644 --- a/net-misc/openssh/openssh-9.8_p1-r1.ebuild +++ b/net-misc/openssh/openssh-9.8_p1-r1.ebuild @@ -422,6 +422,9 @@ openssh_maybe_restart() { systemctl try-restart sshd eend $? elif [[ -d /run/openrc ]]; then + # We don't check for sshd -t here because the OpenRC init script + # has a stop_pre() which does checkconfig, i.e. we defer to it + # to give nicer output for a failed sanity check. ewarn "The ebuild will now attempt to restart OpenSSH to avoid" ewarn "bricking the running instance. See bug #709748." ebegin "Attempting to restart openssh via 'rc-service -q --ifstarted --nodeps sshd restart'"