From nobody Sun Sep 24 14:21:34 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 4Rtp8v1pHfz4v2Wv; Sun, 24 Sep 2023 14:21:35 +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 4Rtp8v1M2yz4fGk; Sun, 24 Sep 2023 14:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695565295; 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=2SsD9/cOlLfw9bpVNPjNuz9B7BBnkiyWdIx8Xuds3k0=; b=ak9rKJVBHbuosvFC+zA3PxSvjKfwXpNhyA9KZsw1go9FGl7upAtNkRJJ3GIf+Y2WOP/dk4 ZHI2q35768p8AQ9+u9/MuoYxJo4vGisJaovN5CPv97YcFgeAARPn4tNAi1E91baU2Z2Pss cmbSDPZfzfhbeLuqt7dekIvHNcH4AYiKPFWXaa8RMkwbTKVYpTSbn9/nKu6puKF/q8nKoP a+zOKsfyvu/XZTjV4nVY35Tzw1ML6Ic2dGxVGie4dMocw86jbsVzY+kXa1xLMF24Qitw8Q GMdIp55pAl8gqR4GpWYMR/qM8cNhXCBViI3M7I+d6l1NJECIpHSHkrx7HMuunQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695565295; a=rsa-sha256; cv=none; b=FwKlt9CEZjwsVxVGoeCGsT2dues2Wbd9qL0C8vuci8gqZGcR8dfHWoMSRg+y2h1/Ou/vOK uZ/sINf7XA9v6+yEJXMGTVQ52FPP0nFrVswY/vqUuYprBaDjaIlFy9GReYpBdTjt+/RByB TuQWBcs57z26rpfvmSbeLGpLGA5eze7mhjeQcsQeymfynTRMY4kUrd6rDr3PSzTxaIbX6C DV770ydjpu8aOL6neB0IV/+Nk6K2+cPNfEDULBxyLF/IFxfxCgEOyY6sZKJ2PnwTuj+r5C gPN7Yt67ELOotcjn6dXfmpswk/uxQUIBObNJ7bWnnpKlF1wbR+hbk/9XURi84A== 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=1695565295; 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=2SsD9/cOlLfw9bpVNPjNuz9B7BBnkiyWdIx8Xuds3k0=; b=AUpQZcXV/xrGpXN42HP4ExRRTEIwjg1x8YWNLy8fC0QE0gU3z6rArRZ0oAFNPZOnZTRgs9 N2GVcpk0ABRSjVykwx9QqcvDNu5EkT5bL8YMoOxyaAogIAhQIYVfTk5dyxta6mfirEKNO2 R7zEZjVxdw5S9BNYjjgcu2AhQdpgkocFkTJE1KVv704NZtnX3Qh5KxnbdFylSWSAd1DNzb 4aNiJqc/NH7fUbKXTzldyrGzQELjKGWfG4OalJwwOdJtcD8nyHcIfxyRk/OE606OkeL5kV C9tiBso45Rl1xtgtvH6NsQ0uodpRnvpKONQmbzJIc1zo20aaw1xKCKEDRlJigw== 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 4Rtp8v0QjFzqZR; Sun, 24 Sep 2023 14:21:35 +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 38OELYid088511; Sun, 24 Sep 2023 14:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OELYDZ088508; Sun, 24 Sep 2023 14:21:34 GMT (envelope-from git) Date: Sun, 24 Sep 2023 14:21:34 GMT Message-Id: <202309241421.38OELYDZ088508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 95d4529fb06b - stable/13 - rc.subr: don't require service to be enabled for `status` 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 95d4529fb06b6121a87ee06b0ab982fe49e3ce82 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=95d4529fb06b6121a87ee06b0ab982fe49e3ce82 commit 95d4529fb06b6121a87ee06b0ab982fe49e3ce82 Author: Daniel Tameling AuthorDate: 2023-07-01 08:43:40 +0000 Commit: Ed Maste CommitDate: 2023-09-24 14:07:40 +0000 rc.subr: don't require service to be enabled for `status` For a service that sets an rcvar, there is a check whether it has been enabled before the actual command is executed. If the check fails, one gets a message to enable it and the returned exit status is 0. However, this is usually undesirable for the status command, which is a) supposed to check whether the service is running anyway and b) returns a non-zero exit code if that is not the case. Thus, skip the check for the status command. PR: 272282 Reviewed by: emaste (cherry picked from commit ba793728a840041e93e38bcbff4a7233dc63b722) (cherry picked from commit f701d9da1d94891dd2edad607a989cad6eb10313) --- libexec/rc/rc.subr | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index d679584768d0..37a614e122a4 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1009,13 +1009,14 @@ run_rc_command() continue fi # if ${rcvar} is set, $1 is not "rcvar", "describe", - # "enable" or "delete", and ${rc_pid} is not set, run: + # "enable", "delete" or "status", and ${rc_pid} is + # not set, run: # checkyesno ${rcvar} # and return if that failed # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a "$rc_arg" != "stop" \ -a "$rc_arg" != "delete" -a "$rc_arg" != "enable" \ - -a "$rc_arg" != "describe" ] || + -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then if [ -n "${rc_quiet}" ]; then