From nobody Sun Sep 24 16:19:27 2023 X-Original-To: dev-commits-src-branches@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 4Rtrmv43G3z4v8yw; Sun, 24 Sep 2023 16:19:27 +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 4Rtrmv3Qn4z3Q3x; Sun, 24 Sep 2023 16:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695572367; 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=1tq1+w8rji4NdMdNbb+jjLaq/+asXBd5HnlLq1ElU0s=; b=UKOMfheBkrRO/mScUa3NMDs7a24MEewv9JcHFeFUo+dbi2yTkqITZ5fbG4i/rw0OyO8ies IIxwyqSWfr0Wkc4aGFdVi93ij2VPUsLftL5+mh/MzQrmxk1p+v9heovpjSt2tZoWORSL9z Bqrr+AML+dyoZdSuhriX9fQqhyLgiWg+nFrkcN9XQs43+PgRh5BOzEaJ6ns63d1PWsvEl1 TlPHh7647DO0OPNQ54HcV06K+szAlJ4vUMzcKXCyOB7XHfAEQYi7Y/1aZa7ORTQ6OuB9JE iwDViV3yVvE6gcrLmiCpOIiWwONRqJE03HKv5EJnwA5Qu3bABFegc1RnFdxjjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695572367; a=rsa-sha256; cv=none; b=cKdguj/kUkBZ0sVdnd75z7AU87hcjlpFu+iifX+ZK0SK4H7QXLyRcw3I5NVW56NHE3Fa0p aVDC3LDZwJ7edviOMD5ZF/Ru4hAcZDV21LP6TgOlrFXcNsFghTztkP8Ij8+d5AQRsuwlbj 0moLq7JvVWbyJQmYoNelZA05Zt98ffW4hZkWXnsgTHYF4a8PI4/JH98f8ciK9RLemH42V/ 1Xjoa+wYw6hdIv4KKRUaOx4jU4GorY5kcYH3i3e4UfRddK2mgLm6x21OtdRQctTev1yyKE b0pICMu7lxkXXC1oGTGLWOyAUQRiSHd4pAKa+5hF0rb8hcOKCZ4U7kQ1fR2naw== 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=1695572367; 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=1tq1+w8rji4NdMdNbb+jjLaq/+asXBd5HnlLq1ElU0s=; b=EeDSbHSlePN53lFTh66Xmh1pQuj8dtnDq3dvBu8xa+cVqkL6Rr4/Q5potgdwt3Keh3+TIg bZPMF8inuNwTDKvG/mOAt83fFkALGodNGg7aaXDzC7rPnTNLSIIL18il3T7dD9KP5meMho OUOYvLIuRyeE0yf1Cydb3+7VHgEfUNbjoRSvaK02CEJaXOF5ljwHVSmGunpcxBfVbKBI8Z a3IjLPO2Yh/lxX5XziUsP6hZcQje1T7kYP8UkVOLelkkEHjq0FgoWs/E+joHfempnJa2zp wDDdIm4yrg7b3J5AqokVlmuuyQlob6darkJproh69mXmZK8PH/6/AQ/wa3vN1w== 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 4Rtrmv2TGnztVn; Sun, 24 Sep 2023 16:19:27 +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 38OGJRKi079503; Sun, 24 Sep 2023 16:19:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OGJRdK079500; Sun, 24 Sep 2023 16:19:27 GMT (envelope-from git) Date: Sun, 24 Sep 2023 16:19:27 GMT Message-Id: <202309241619.38OGJRdK079500@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: 20f6af198e72 - releng/14.0 - rc.subr: don't require service to be enabled for `status` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 20f6af198e728262472bd347d68ea264b8cf37eb Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=20f6af198e728262472bd347d68ea264b8cf37eb commit 20f6af198e728262472bd347d68ea264b8cf37eb Author: Daniel Tameling AuthorDate: 2023-07-01 08:43:40 +0000 Commit: Ed Maste CommitDate: 2023-09-24 16:18:41 +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) Approved by: re (gjb) --- 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