2 files changed, 23 insertions, 4 deletions

diff --git a/etc/daily b/etc/daily
index b30682500c91..8fd820f039bf 100644
--- a/etc/daily
+++ b/etc/daily
@@ -44,10 +44,11 @@ fi
 
 cd /tmp
 # This is not safe, you need to decide what is appropriate for your
-# system.
+# system. Leave a warning note for now.
+echo "You did not enable the cleaning of /tmp in /etc/daily!"
 #
 #find / ! -fstype local -a -prune -o \
-#	\( -name '[#,]*' -o -name '.#*' -o -name a.out -o -name core \
+#	\( -name '[#,]*' -o -name '.#*' -o -name a.out -o -name *.core \
 #	   -o -name '*.CKP' -o -name '.emacs_[0-9]*' \) \
 #		-a -atime +3 -exec rm -f -- {} \;
 #
@@ -124,7 +125,7 @@ echo ""
 echo "Checking subsystem status:"
 echo ""
 echo "disks:"
-df -k
+df -k -t local
 echo ""
 dump W
 echo ""
diff --git a/etc/weekly b/etc/weekly
index 68590f084aa2..c1e99d71ac83 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -66,4 +66,22 @@ cd /
 
 echo ""
 echo "Rebuilding locate database:"
-echo /usr/libexec/locate.updatedb | nice -5 su -m nobody 2>/dev/null
+locdb=/var/db/locate.database
+touch ${locdb}; chown nobody ${locdb}; chmod 644 ${locdb}
+echo /usr/libexec/locate.updatedb | nice -5 su -m nobody 2>&1 |\
+        fgrep -v 'Permission denied'
+chmod 444 ${locdb}
+
+echo ""
+echo "Rebuilding whatis database:"
+MANPATH=${MANPATH:-/usr/share/man:/usr/X11R6/man:/usr/local/man}
+
+for mandir in `( IFS=":"; set -- ${MANPATH}; echo $* )`
+do
+        if [ ! -d ${mandir} ]
+        then
+                continue
+        fi
+        echo "==> ${mandir}"
+        makewhatis ${mandir}
+done