From nobody Tue Feb 28 08:49:18 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 4PQrdV6XGpz3vBSG; Tue, 28 Feb 2023 08:49:18 +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 4PQrdV5yWPz3kF4; Tue, 28 Feb 2023 08:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677574158; 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=ACO1BbCSSxHUfDYEg70V9Jk9EycH0m5X+9R2tP4C87U=; b=O4z3cglbxR3mv98low0sNWwBpeX+sFVPhqBmCHL3Eq2ka6k1ZsvVMHH483xaHKsN1gkM7x 4Qmxrh1E+jpkkkHKuwfWJdYCaKea/5tuMkuvk9x98PyCMt1NSApAG+WTDUvDrGugCjTzYL lSYQY4F0DaQD46iiD6PEpD7+M32v81sJ3t5B89Of2F6nYtAlphwyp44oOLvruqamBXssbo 8dP7FPD/MeMltTpDYjRhRvhlfpJw2GtGHbDsKpu1yGUUBPyauwKfzrmYBLehkSWu6qCwp7 MulNI7C7Mc2VzImf3vktr/C2YypbKR2PY+QzGq/unwbr5qct4hVQnKCRps91uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677574158; 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=ACO1BbCSSxHUfDYEg70V9Jk9EycH0m5X+9R2tP4C87U=; b=yLols2Nn4dm8N69CcKXh/ziYnfYuDzsdDsoKyF+aNulDAt520xOIpZ+x1Z1c6peu6QhUyj RAtYBuEJlnx7hONr1uW9ywwHRLRD4yzmkY7bcM4bsF/uTsKcJ7nDlTWLBm+M2VzeY/IPBB 1m2c8OzodzqntHndx8p9OX1hLOdoD6YkCKSIyEl9qi0+F16iwe3Y334EmRzLWyKu7bDgW/ ke9DwtRfykOQMnxmQRGW9j4O1I6hHvHVjNnqev3fgI/jdSqeV6vx5qjJp1nbXr7yHftJeI JfZF75arPXQUl1wJkvQR0KwG2/khmxctUDWLGdbYY+E/fLDoLqAyqJ4/7SW39g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677574158; a=rsa-sha256; cv=none; b=DhQC3VXodNi/72f5Yy+oh4qIIH5I6/Led7wrk8LvBAMtxZB9RjDEjGiXLjUHXxRQ6LSPCG /srvNZKVGdc7kcSR/ykIoFzR6a7PtI5ag+p4Nh28MB5Pasty+cAnZ1B4dWHlaLhKZXoe0Q 1Ma5/dR3q/Q6bszXgnxB5cfJLoSua6jjDDkFH/L1DHxEa6rJoABIOar2NsxAMqY5gt5P3h S1A2iPGKAWqiUoIZe6xCS6S0rSZSa9XRFmGCLABd7r7wZy+5yPwthGHNEQ4VoXJxSIHPPT YJkqs3BsKWYhd2mJqiXohD7KA894Ft3fg/KZQN0sJlZ5qEiS0ccAK0kVc0NCng== 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 4PQrdV53tVz11VV; Tue, 28 Feb 2023 08:49:18 +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 31S8nIfd065650; Tue, 28 Feb 2023 08:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S8nIig065649; Tue, 28 Feb 2023 08:49:18 GMT (envelope-from git) Date: Tue, 28 Feb 2023 08:49:18 GMT Message-Id: <202302280849.31S8nIig065649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: b45f09ac5756 - main - periodic: switch lockf to silent operation. 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b45f09ac57567de5c99a98941e5e06ecd5074871 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=b45f09ac57567de5c99a98941e5e06ecd5074871 commit b45f09ac57567de5c99a98941e5e06ecd5074871 Author: Alexander Leidinger AuthorDate: 2023-02-28 08:38:42 +0000 Commit: Alexander Leidinger CommitDate: 2023-02-28 08:38:42 +0000 periodic: switch lockf to silent operation. This fixes duplicate mails (one from cron, one from periodic) when a periodic run is not finished bfore the next one starts. The man page states that the intended use case is cron, and the error handling of the lockf invocation handles this case explicitely, as such no error message for the "interactive" use was considered. --- usr.sbin/periodic/periodic.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index 26413c4ab51e..cdbd1b3b57fb 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -53,7 +53,7 @@ if [ $1 != "LOCKED" ]; then ret=0 for arg; do lockfile=/var/run/periodic.${arg##*/}.lock - lockf -t 0 "${lockfile}" /bin/sh $0 LOCKED "$arg" + lockf -s -t 0 "${lockfile}" /bin/sh $0 LOCKED "$arg" case $? in 0) ;; 73) #EX_CANTCREATE