From nobody Sun Sep 24 13:19:55 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 4Rtmnl5L1Pz4ty9G; Sun, 24 Sep 2023 13:19:55 +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 4Rtmnl4cSbz4WML; Sun, 24 Sep 2023 13:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695561595; 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=u81/sb1gGcHAwEcsPnh1uFVIibn9jiW/pfBEsNDpTdA=; b=orZowJ20vg9aKWtVb8mysEfuRyiSrNp2z7xKJn3lyjMdi3SN4Xe06MbTS/UjQlSkeO1/hM E14NxnuCV2VPQ8QnOpSkv+1jXXxLcZXJCn6u5GlfYycuy+fmRnJg8HBHef3375QEZFJ3xE GjBzySxRwhwewNz/0sZ0Owulyyt78IhRxvDRmTX2Wv5FzPEIwDPHb0CvTjRFD4bT6gFGiE 4qYK6d4GmEis+zR4f6ODJaF4feXmYYWs5B0B1NujmVwbVgIlo8rvE2uKwq+3AUjpRh7moV N61Xr078x92X4K48F1kbJqeVmffz5U+0nHnzz/96oUk7vkcTOjlbZDvs38AkuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695561595; a=rsa-sha256; cv=none; b=kUvkI5eiXgWM2v8SO0usyxgljOxluReY9wCPlX+Fc8BSnYOVxBUUDvUJKKB1mXro/FDsgC mb9ccsd1J8btYc7sDCNThQn2su98SJ43cXRLtOTPA+sT7+MmZ4urt0JB+jfM8lGokGIGc4 QJ8aPJHkZttw+GmGLjvHMUgRXwWdL8N6AxiKfoQHb86MbrUamL8XnKCxjiYazcHb4hzmUQ NuDDY3WDVZaNDtmIoepjBIC8hf7dAA8lrHpV18DmvtUD0tgBO25UrAvQ19fXEy2YDHhcIB nptCzfiJIS2a4pR6HLnyh57ns8QsIpoOo7tqTm90U5MIhZeAiN0L7eG7Ft1ztg== 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=1695561595; 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=u81/sb1gGcHAwEcsPnh1uFVIibn9jiW/pfBEsNDpTdA=; b=LB7S/PQ2kY6d1Xje2SGodoInFSQ+AZ02aX9SI27trjlrj/BXEWLw4PrPDEhvf2OC+wNWz3 okgDYl2FsC/Ui6cXeggBr9WnbP6ADYgpdxyGtPOq8NPTQ9w4M2YKbC3C3shaeXIPcdL23m FdjqQ5KV4T5GfspXYmL1MlVMhirMc7mCfiKhMVO29tNzJRr+k8eDrqK92bl3Gpwr5VgBTA Dc8aCsMJmu0R0Mx/IbS4Q8Lg/WUSLaXLBgvTNsZVLGZJ8erSUMfOmkdgu8tq4/fZ5PR037 ROeO8OBpcznqEv96WvYb3yoOeT4l1d32fxGzpb0ntwwReyhVOZZaJ/vSFLV/6A== 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 4Rtmnl3Q0Gznvw; Sun, 24 Sep 2023 13:19:55 +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 38ODJtDo079701; Sun, 24 Sep 2023 13:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38ODJtol079698; Sun, 24 Sep 2023 13:19:55 GMT (envelope-from git) Date: Sun, 24 Sep 2023 13:19:55 GMT Message-Id: <202309241319.38ODJtol079698@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: f701d9da1d94 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f701d9da1d94891dd2edad607a989cad6eb10313 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f701d9da1d94891dd2edad607a989cad6eb10313 commit f701d9da1d94891dd2edad607a989cad6eb10313 Author: Daniel Tameling AuthorDate: 2023-07-01 08:43:40 +0000 Commit: Ed Maste CommitDate: 2023-09-24 13:17:43 +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) --- 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