From nobody Mon Feb 10 22:26:51 2025 X-Original-To: dev-commits-src-main@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 4YsK1l6v0hz5mv1t; Mon, 10 Feb 2025 22:26:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsK1l6DK0z3hjl; Mon, 10 Feb 2025 22:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739226411; 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=EDATpJvfqiRyMLEUTTV69szrRb6TNpbJMLullyc8PAI=; b=G0KjnlGV2HgMDocmDSHs/mQ0SEgGJlBEOgI7kg/PrW9UDefVBLMVzGkGW+HJ9auyLV3962 MVjZO9AnS+ZJ4JY8j3/0P5Q8omfuUMS0Zr6bk20bHEaLlW+F6jFNK+kMH6iJ0qbKlKRtT0 TEtqi37Vsu9HZ9brRhB/IPsSbeWTqAYPCq4SlREevxhs9yCNBknWF/odLg2L1dEFgFq2io 5DozL8YnZ1xykNoGhyzuV+Ku50uS/V2EigqSFkf5snIWCfzrK69ZtRd3IX31qLx/6fcDvr ZaWn72aXU9TFDYL1SupqhpMHQ9rzabNY0hRZ1XSbDJmwoTb3LxAJTmis7MjPsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739226411; 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=EDATpJvfqiRyMLEUTTV69szrRb6TNpbJMLullyc8PAI=; b=l1VNquW266HK+qHvQBrhcxPkwliIIbw1L17jc628+GonkYFfXuO90oX5z6Q1EEu8ZyVjQo a6pnXw8sluO3rPyrT+nLljBBj/l42Cb8N3U80mRY/11EjFmQIAFBzudnPMGt5mMCUIETmu Pin1BLpUUIY4USoiJxzO/ErSgAk0n9z81+9H6s4+O91tqLXXv8/mYdNWwqhaRkIeESRqUw E8RaN1ncfydmj28BT+QlHlOHZgwWHIKma7GDgE76UkrJ4sA1E/Iw/spWxpUub5yCwtx365 VbAUmAfUhku6nKaGCqo6U8H0PxhzSotzNoKjs5rdxOsz84rJGSPUwTZx4niy6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739226411; a=rsa-sha256; cv=none; b=YncfkvB7Xb/3WUWz4ML/XvUe9u3CI1cqy+tONh8rjSqc7vCVfoIiMy/cFvcKig7C+09CWC pZevfcTmXLDetM8SKPvNgrRN3ULe6RF8346kXyETDzRFAD2nElgAfxZEnQcUiIS4BDsV75 dib79IxUXafGeYCNeOOgD9gLh27ojTH8HczRupUt2hPmtfKodVDZCR8kfNQiNt0BGRBCdF oxiYeBVEYRwiHYEbuqVJnN+JvJggeHUDRWk7vRQwh4GGYkGhnF6uw3pXOQsU2AXlHUASYd xBSQS/ECMIiYJX3BI7vgfcXomDfDThrx3jDDZ8kCyRfNH56+g1QYTwU+NFL1jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YsK1l5rBMzmMn; Mon, 10 Feb 2025 22:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51AMQpOW076643; Mon, 10 Feb 2025 22:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51AMQp6T076640; Mon, 10 Feb 2025 22:26:51 GMT (envelope-from git) Date: Mon, 10 Feb 2025 22:26:51 GMT Message-Id: <202502102226.51AMQp6T076640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: f8f5b658bc76 - main - rc.subr:rc_trace take advantage of sdot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8f5b658bc76cd539951fb8ac712d9acf71763ca Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f8f5b658bc76cd539951fb8ac712d9acf71763ca commit f8f5b658bc76cd539951fb8ac712d9acf71763ca Author: Simon J. Gerraty AuthorDate: 2025-02-10 22:23:38 +0000 Commit: Simon J. Gerraty CommitDate: 2025-02-10 22:23:38 +0000 rc.subr:rc_trace take advantage of sdot Since we now have sdot, use it to get RC_LEVEL from rc.conf.d/rc_trace also avoid logging execution of ':' when RC_LEVEL > 0 Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D48856 --- libexec/rc/rc.subr | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index dc2cc06bb806..b7f8953012d7 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -207,15 +207,8 @@ rc_trace() if [ -z "$RC_LEVEL" ]; then [ -f $cf ] || return - if [ -s $cf ]; then - # don't try to set RC_LEVEL without sed - if [ -n "$SED" ]; then - RC_LEVEL=$($SED -n '/^RC_LEVEL=/ { s/.*=//p;q; }' $cf) - RC_LEVEL=${RC_LEVEL:-0} - fi - else - RC_LEVEL=0 - fi + RC_LEVEL=0 # existence is 0 at least + sdot $cf # allow override fi [ ${RC_LEVEL:-0} -ge ${level:-0} ] || return rc_log "$@" @@ -1310,7 +1303,9 @@ run_rc_command() _postcmd=\$${rc_arg}_postcmd if [ -n "$_cmd" ]; then - rc_trace 1 "$_cmd" + if [ "$_cmd" != : ]; then + rc_trace 1 "$_cmd" + fi if [ -n "$_env" ]; then eval "export -- $_env" fi