diff options
author | wollman <wollman@FreeBSD.org> | 2010-11-01 01:51:47 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 2010-11-01 01:51:47 +0000 |
commit | 1c442b66f2df868491972f88a5f919e1a490cd4e (patch) | |
tree | bab25e94a660d6d3a74040ade38b3ae82c662b14 /usr.bin/locate | |
parent | 4c899bcdf584314de52f734880351b0c02dfe3bf (diff) | |
download | FreeBSD-src-1c442b66f2df868491972f88a5f919e1a490cd4e.zip FreeBSD-src-1c442b66f2df868491972f88a5f919e1a490cd4e.tar.gz |
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.)
Diffstat (limited to 'usr.bin/locate')
-rw-r--r-- | usr.bin/locate/locate/updatedb.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh index 619180e..77fd24a 100644 --- a/usr.bin/locate/locate/updatedb.sh +++ b/usr.bin/locate/locate/updatedb.sh @@ -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 |