Author: wollman
Date: Mon Nov 1 01:51:47 2010
New Revision: 214613
URL: http://svn.freebsd.org/changeset/base/214613
Log:
jilles@ pointed out that using ${PRUNEDIRS:=".zfs"} in updatedb.sh
made it impossible to override PRUNEDIRS to make it empty. Use the
non-colon form to only set PRUNEDIRS if it is completely unset. (For
parallelism, the other configuration defaults here could be done the
same way, but that could be more obviously accomplished by disabling
updatedb in periodic.conf, so leave them alone for now.)
Modified:
head/usr.bin/locate/locate/updatedb.sh
Modified: head/usr.bin/locate/locate/updatedb.sh
==============================================================================
--- head/usr.bin/locate/locate/updatedb.sh Mon Nov 1 01:03:05 2010
(r214612)
+++ head/usr.bin/locate/locate/updatedb.sh Mon Nov 1 01:51:47 2010
(r214613)
@@ -52,7 +52,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; ex
: ${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
-: ${PRUNEDIRS:=".zfs"} # unwanted directories, in any parent
+: ${PRUNEDIRS=".zfs"} # unwanted directories, in any parent
: ${FILESYSTEMS:="$(lsvfs | tail -n +3 | \
egrep -vw "loopback|network|synthetic|read-only|0" | \
cut -d " " -f1)"} # allowed filesystems
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
