Skip to content

Commit

Permalink
jilles@ pointed out that using ${PRUNEDIRS:=".zfs"} in updatedb.sh
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
gwollman committed Nov 1, 2010
1 parent 4c899bc commit 1c442b6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion usr.bin/locate/locate/updatedb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
: ${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
Expand Down

0 comments on commit 1c442b6

Please sign in to comment.