From nobody Tue Oct 26 15:00:22 2021 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 DDD131821852; Tue, 26 Oct 2021 15:00:22 +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 4Hdw3p5xkwz4V5f; Tue, 26 Oct 2021 15:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ABF551E762; Tue, 26 Oct 2021 15:00:22 +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 19QF0MRi035040; Tue, 26 Oct 2021 15:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19QF0MVn035039; Tue, 26 Oct 2021 15:00:22 GMT (envelope-from git) Date: Tue, 26 Oct 2021 15:00:22 GMT Message-Id: <202110261500.19QF0MVn035039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 8019068d7c30 - main - /etc/periodic/weekly/310.locate must read /etc/locate.rc 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8019068d7c30e45ad392669a6577e5f1db56421d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=8019068d7c30e45ad392669a6577e5f1db56421d commit 8019068d7c30e45ad392669a6577e5f1db56421d Author: Wolfram Schneider AuthorDate: 2021-10-26 14:59:39 +0000 Commit: Wolfram Schneider CommitDate: 2021-10-26 14:59:39 +0000 /etc/periodic/weekly/310.locate must read /etc/locate.rc PR: 160225 Reported by: Hiroaki Abe Reviewed by: se Approved by: se Differential Revision: https://reviews.freebsd.org/D32646 --- usr.sbin/periodic/etc/weekly/310.locate | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/periodic/etc/weekly/310.locate b/usr.sbin/periodic/etc/weekly/310.locate index 4079f5e8287e..b7481965444a 100755 --- a/usr.sbin/periodic/etc/weekly/310.locate +++ b/usr.sbin/periodic/etc/weekly/310.locate @@ -16,7 +16,9 @@ case "$weekly_locate_enable" in echo "" echo "Rebuilding locate database:" - locdb=/var/db/locate.database + . /etc/locate.rc + : ${FCODES:="/var/db/locate.database"} + locdb="$FCODES" touch $locdb && rc=0 || rc=3 chown nobody $locdb || rc=3