From nobody Thu Sep 21 23:30:56 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 4RsBV866Jlz4v8yq; Thu, 21 Sep 2023 23:30:56 +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 4RsBV85hc2z4N27; Thu, 21 Sep 2023 23:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695339056; 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=d2pZH2ABHu/HCEcGoMKjkHDP4A4El7NSdnXo5rcBY5Y=; b=FbSnfyj0qbQeneHupO8GAwARwQQN91AeYmrjfaJn+dcSyJ0pkkVpOgksa+c99CJLyAvTfL gwQl8AzQTIFsDFdsbee5q07P5ekZHjinhcTK7k+ocPtQ4myto4m9+uPWRNcs1VB9Cygogt k80z0gPgQV1bV0H40brXt/a3KvLe0n6I6zX3DO9YqD4C1ktnWweuloearviWlB7t3hxCm8 wJbLVOEgYfRgXH3oLQEHaKYjcQviD8LFM84O7rLhNnU7T8r/WBHKkTaa7eQDIhae6snKOG 3NFgkRSyEL4AH81pb5CJeErMZIjnZKydJ5iAQQH6mN/vNNOD9f26iUK18zr9/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695339056; a=rsa-sha256; cv=none; b=A6mvWda12b2S6PYeY7of3YtvhLUCu5ckTjMp5VoqmLGHkOXhjofAJdoJCSNzPonJE/rev0 Jmi2RFe4Ns5IgZrtkyCfGWZuCwGhMhvpjhCu+BeZK0hP1TGbx5Eh8h4PudRNWxTlKSmWah Z41E0ZsU2Abdw9AjDgU32xgKK4YpoBJ4D/08gQ8tMi9/Kyo+E8pB63X5T8DvCwtNwyrrTo xrsj/+zbh2+d72TLFbjfrB4MKCZoSxNzGy5rLjiMDo7UebrCRn6og1k+bqUyZi9CYi/5Fx qbVPRtHu1u9BSFT8osPhcFp+CEAM5jtfxo7UmmFbxICz4jR6pge6srs9yfWgaQ== 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=1695339056; 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=d2pZH2ABHu/HCEcGoMKjkHDP4A4El7NSdnXo5rcBY5Y=; b=Vq4Gdj/NfdHv3DUoIGOqczpcv35RBKiCIKojfgeZfNPw4zxWprKizR3HL78+eTfFEXADba HSSm9zmt55SEmKiQjKrBDnjNUKevS59FQYAuEPmIC1kaH2b+u/to92gmgts8ub+57tEri7 OABb8tQfS4jLPqCoYahiIK+i5VSrZwY29g5ADo7FXkCPlDyVP/jqScGDH4f8kxnF9Wo4+j z9fpGrzRE+236gjdrro4B4DGPESFv5KRnF/OBDvW7/nDiJIBpDpg+z6Bh1wJCyMJwKl50e +gzq9ytaW2ipAP+1zx8H9SupaGhNdgKd4YM2THZG/r/heYsgZ7jXXExCxupD1w== 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 4RsBV84lZhzyFW; Thu, 21 Sep 2023 23:30:56 +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 38LNUus0003364; Thu, 21 Sep 2023 23:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LNUuAI003361; Thu, 21 Sep 2023 23:30:56 GMT (envelope-from git) Date: Thu, 21 Sep 2023 23:30:56 GMT Message-Id: <202309212330.38LNUuAI003361@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: ba793728a840 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ba793728a840041e93e38bcbff4a7233dc63b722 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ba793728a840041e93e38bcbff4a7233dc63b722 commit ba793728a840041e93e38bcbff4a7233dc63b722 Author: Daniel Tameling AuthorDate: 2023-07-01 08:43:40 +0000 Commit: Ed Maste CommitDate: 2023-09-21 23:28: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 MFC after: 3 days --- 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 17ca904ff1e7..332718dc6f2c 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1041,13 +1041,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