From uspoerlein@gmail.com Thu Jun 28 17:20:42 2007 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 11E8116A469 for ; Thu, 28 Jun 2007 17:20:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.175]) by mx1.freebsd.org (Postfix) with ESMTP id 9433113C4BA for ; Thu, 28 Jun 2007 17:20:41 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by ug-out-1314.google.com with SMTP id o4so164905uge for ; Thu, 28 Jun 2007 10:20:40 -0700 (PDT) Received: by 10.82.182.1 with SMTP id e1mr4173492buf.1183051239925; Thu, 28 Jun 2007 10:20:39 -0700 (PDT) Received: from roadrunner.q.local ( [85.180.136.95]) by mx.google.com with ESMTP id f19sm6965367fka.2007.06.28.10.20.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Jun 2007 10:20:39 -0700 (PDT) Received: from roadrunner.q.local (localhost [127.0.0.1]) by roadrunner.q.local (8.14.1/8.14.1) with ESMTP id l5SHJk6h004657; Thu, 28 Jun 2007 19:19:47 +0200 (CEST) (envelope-from q@roadrunner.q.local) Received: (from q@localhost) by roadrunner.q.local (8.14.1/8.14.1/Submit) id l5SHJkpN004656; Thu, 28 Jun 2007 19:19:46 +0200 (CEST) (envelope-from q) Message-Id: <200706281719.l5SHJkpN004656@roadrunner.q.local> Date: Thu, 28 Jun 2007 19:19:46 +0200 (CEST) From: Ulrich Spoerlein To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [PATCH]: Add ZFS to periodic locate run X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 114101 >Category: conf >Synopsis: [patch] Add ZFS to periodic locate run >Confidential: no >Severity: non-critical >Priority: low >Responsible: se >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 28 17:30:04 GMT 2007 >Closed-Date: Mon Aug 16 18:38:12 UTC 2010 >Last-Modified: Mon Aug 16 18:38:12 UTC 2010 >Originator: Ulrich Spoerlein >Release: FreeBSD 7.0-CURRENT i386 >Organization: >Environment: >Description: Only ufs and ext2fs are searched. With lots of people putting their system on ZFS, we should add it to the list, too. Also, I couldn't help but fix a minor indention slip up :) >How-To-Repeat: >Fix: --- patch begins here --- Index: usr.bin/locate/locate/updatedb.sh =================================================================== RCS file: /home/ncvs/src/usr.bin/locate/locate/updatedb.sh,v retrieving revision 1.20 diff -u -p -r1.20 updatedb.sh --- usr.bin/locate/locate/updatedb.sh 12 Nov 2005 12:45:08 -0000 1.20 +++ usr.bin/locate/locate/updatedb.sh 28 Jun 2007 17:17:20 -0000 @@ -50,9 +50,9 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; ex : ${mklocatedb:=locate.mklocatedb} # make locate database program : ${FCODES:=/var/db/locate.database} # the database -: ${SEARCHPATHS:="/"} # directories to be put in the database +: ${SEARCHPATHS:="/"} # directories to be put in the database : ${PRUNEPATHS:="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories -: ${FILESYSTEMS:="ufs ext2fs"} # allowed filesystems +: ${FILESYSTEMS:="ufs zfs ext2fs"} # allowed filesystems : ${find:=find} case X"$SEARCHPATHS" in --- patch ends here --- >Release-Note: >Audit-Trail: From: Craig Rodrigues To: Ulrich Spoerlein Cc: bug-followup@freebsd.org Subject: Re: conf/114101: [PATCH]: Add ZFS to periodic locate run Date: Tue, 10 Jul 2007 22:37:50 -0400 --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Instead of the patch you submitted for conf/11401, can you try this patch? -- Craig Rodrigues rodrigc@crodrigues.org --KsGdsel6WgEHnImy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="a.txt" Index: updatedb.sh =================================================================== RCS file: /home/ncvs/src/usr.bin/locate/locate/updatedb.sh,v retrieving revision 1.20 diff -u -u -r1.20 updatedb.sh --- updatedb.sh 12 Nov 2005 12:45:08 -0000 1.20 +++ updatedb.sh 11 Jul 2007 02:36:10 -0000 @@ -52,7 +52,10 @@ : ${FCODES:=/var/db/locate.database} # the database : ${SEARCHPATHS:="/"} # directories to be put in the database : ${PRUNEPATHS:="/tmp /usr/tmp /var/tmp /var/db/portsnap"} # unwanted directories -: ${FILESYSTEMS:="ufs ext2fs"} # allowed filesystems +# allowed file systems +: ${FILESYSTEMS:="$(lsvfs | \ + egrep -v 'loopback|network|synthetic|read-only|^\-|^File' | \ + cut -d " " -f 1)"} : ${find:=find} case X"$SEARCHPATHS" in --KsGdsel6WgEHnImy-- Responsible-Changed-From-To: freebsd-bugs->se Responsible-Changed-By: rodrigc Responsible-Changed-When: Tue Oct 16 18:47:23 UTC 2007 Responsible-Changed-Why: Stefan is taking interest in this. http://www.freebsd.org/cgi/query-pr.cgi?pr=114101 State-Changed-From-To: open->closed State-Changed-By: se State-Changed-When: Wed Oct 17 07:28:14 UTC 2007 State-Changed-Why: A slightly modified version of Craig Rodrigues patch has been committed, thanks a lot. http://www.freebsd.org/cgi/query-pr.cgi?pr=114101 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: conf/114101: commit references a PR Date: Wed, 17 Oct 2007 07:27:58 +0000 (UTC) se 2007-10-17 07:27:51 UTC FreeBSD src repository Modified files: usr.bin/locate/locate locate.rc updatedb.sh Log: The previous version included too many file system types in the scan, since "local" includes also synthetic file systems (e.g. /dev, /proc) and loopback mounts. This version uses lsvfs to identify file system types that are local and additionally not synthetik, loopback mounts, or read-only. This has been suggested by Craig Rodrigues half a year ago. The patch that has been committed is based on his suggestion, but slightly modified. The comments in locate.rc have been updated to reflect the change and o include zfs and xfs in the example file system parameter that can be used to override the default outlined above. PR: 114101 Submitted by: rodrigc at crodrigues dot org (Craig Rodrigues) MFC: 2 weeks Revision Changes Path 1.11 +6 -2 src/usr.bin/locate/locate/locate.rc 1.22 +3 -1 src/usr.bin/locate/locate/updatedb.sh _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State-Changed-From-To: closed->patched State-Changed-By: brooks State-Changed-When: Fri Oct 17 14:14:40 UTC 2008 State-Changed-Why: Re-open this PR to track MFC. http://www.freebsd.org/cgi/query-pr.cgi?pr=114101 From: Phillip Nordwall To: bug-followup@FreeBSD.org, uspoerlein@gmail.com Cc: Subject: Re: conf/114101: [patch] Add ZFS to periodic locate run Date: Sun, 8 Aug 2010 23:41:53 -0700 --0016e648b04ce9dd7e048d5e4f94 Content-Type: text/plain; charset=ISO-8859-1 Fixed for me -- Please close Tested and working in 7-stable and 8-stable during August 2010 Bugathon. Phillip Nordwall --0016e648b04ce9dd7e048d5e4f94 Content-Type: text/html; charset=ISO-8859-1 Fixed for me -- Please close
Tested and working in 7-stable and 8-stable during August 2010 Bugathon.

Phillip Nordwall
--0016e648b04ce9dd7e048d5e4f94-- State-Changed-From-To: patched->closed State-Changed-By: uqs State-Changed-When: Mon Aug 16 18:36:08 UTC 2010 State-Changed-Why: The patch is in 8.x which any person serious about ZFS should be using by now. http://www.freebsd.org/cgi/query-pr.cgi?pr=114101 >Unformatted: