From nobody Fri Dec 16 15:13:46 2022 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 4NYXgH11Nmz1CXWP; Fri, 16 Dec 2022 15:13:47 +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 4NYXgH0SfQz3DHN; Fri, 16 Dec 2022 15:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671203627; 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=Vb8/b7IkyFxeDjRwX0DGm3h0dGSvSa8pAmdYi/cDDQs=; b=nKa6HQTalb5ndNBu6LEQU1YfcTxfreHA1pfwYe2kR3sQlloiTWXjWt1pfe5udiolH7CGiN Ha0fX/dl49dpzU+14rGXiKbocv52gBlAzilQkrumD2Aa/toQyiXeJDuKqa1edQWeYJyBkp OGpGGnIt4bF6ZNHWjqUnfoLgVSCarP+sW+PePS/nUoU3mgeQul6Z1j0wUdOnhCyD9ixgUe GfUAOeaKNRVJtFtsjDbd/l0QzRlW7rdUpuEsUzLIe7xnMnah/S3yOa4+05avEfWFK/5Sq6 Yc//5/Ldp9wSGDg15EFCkNCPwrDx+W+2tChWc2MPrLdYZ9qZmLOG5jg4ZMPFFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671203627; 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=Vb8/b7IkyFxeDjRwX0DGm3h0dGSvSa8pAmdYi/cDDQs=; b=W3AcVlcb1n9y+JBkQl3bHSxaKjRwIGE4y+k7xy61unMHhOFyo/3fnQ/ox+08FbPiynPqXH 37Tdr8U6O4/sEm/CTsvgFgEH3KQLVXWESapq1mnkkwR3y1zMF7bnZL2/RFebBSnHmw/3ZD umdWCLK5LFGvvjjKHu9+MujnKD5aDlkqeDIzqTeEFVWa/FassfIeDES5ajMP2M7g/EspOL TLzWmI2No/0hB6znZwU1sAiQ06+jDiHPHvOble2G1Pmpc4Lzp6ip3aHnV4gGdElyygk4lp SrVbp6rp2zF3BXnKxMGeGy0b0H+M4oxJzjIPKWnIsgYYYOHKFpwEKXAzEcZ+Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671203627; a=rsa-sha256; cv=none; b=V3H4Pk3if5V4JTY+d1XLnOe5gfk78+FgJeCBj01AZhs1kKQHkcj07VKolcMFv+cKVaMyg5 1YOM+70yfxXuae4/aq2Pq9BEk1TNSYPgvDJVYXre8U425v3WExDh8DSJGbT+A18BesaZGO iup2JTQwJG3IoEhxGNVFtf9zcFh1ReBa1t1PBSaMkjMGrwIRNptPFkfggt5pQayOH4100q IJ4i+1AloT8UgK96R4cH0S7V0s9DD1/BG9ssL0n1oTdyTuW5xeKd/ebgqxy8mfLHT5BpOw sd6juz3NvbACQIO3ZQl6GWMd+78xCofvSE5TlqTtq3DqfZJwRDVO6oxc6Cu+hA== 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 4NYXgG6WbXzHkK; Fri, 16 Dec 2022 15:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BGFDkPE070128; Fri, 16 Dec 2022 15:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BGFDkaM070127; Fri, 16 Dec 2022 15:13:46 GMT (envelope-from git) Date: Fri, 16 Dec 2022 15:13:46 GMT Message-Id: <202212161513.2BGFDkaM070127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: c934f2a574e2 - main - daily 150.clean-hoststat: suppress error when using dma 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: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c934f2a574e246eef0e27558d310952e5524e85e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=c934f2a574e246eef0e27558d310952e5524e85e commit c934f2a574e246eef0e27558d310952e5524e85e Author: Mike Karels AuthorDate: 2022-12-16 15:13:07 +0000 Commit: Mike Karels CommitDate: 2022-12-16 15:13:07 +0000 daily 150.clean-hoststat: suppress error when using dma dma(8) does not have hoststat or purgestat, so this script produces an error from the daily script. We could disable this script, but that would mean yet another change to switch back to sendmail. Check for purgestat in mailer.conf before attempting either hoststat or purgestat. Reviewed by: pstef, bapt Differential Revision: https://reviews.freebsd.org/D37712 --- usr.sbin/periodic/etc/daily/150.clean-hoststat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/periodic/etc/daily/150.clean-hoststat b/usr.sbin/periodic/etc/daily/150.clean-hoststat index 460d1a267908..54d4d4c21dab 100755 --- a/usr.sbin/periodic/etc/daily/150.clean-hoststat +++ b/usr.sbin/periodic/etc/daily/150.clean-hoststat @@ -2,7 +2,7 @@ # # $FreeBSD$ # -# Remove stale persistent host status files +# Remove stale persistent host status files if the mailer supports it. # # If there is a global system configuration file, suck it in. @@ -14,7 +14,9 @@ fi case "$daily_clean_hoststat_enable" in [Yy][Ee][Ss]) - if [ -z "$(hoststat 2>&1)" ]; then + if ! grep -q '^purgestat' /etc/mail/mailer.conf; then + rc=3 + elif [ -z "$(hoststat 2>&1)" ]; then rc=2 else echo ""