Wed Mar 4 14:54:38 2015 UTC ()
there is no more makewhatis


(christos)
diff -r1.29 -r1.30 src/etc/weekly
diff -r1.4 -r1.5 src/etc/defaults/weekly.conf

cvs diff -r1.29 -r1.30 src/etc/weekly (expand / switch to unified diff)

--- src/etc/weekly 2012/08/29 20:34:19 1.29
+++ src/etc/weekly 2015/03/04 14:54:38 1.30
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh - 1#!/bin/sh -
2# 2#
3# $NetBSD: weekly,v 1.29 2012/08/29 20:34:19 wiz Exp $ 3# $NetBSD: weekly,v 1.30 2015/03/04 14:54:38 christos Exp $
4# from: @(#)weekly 8.2 (Berkeley) 1/2/94 4# from: @(#)weekly 8.2 (Berkeley) 1/2/94
5# 5#
6 6
7export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/libexec 7export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/libexec
8umask 077 8umask 077
9 9
10if [ -s /etc/weekly.conf ]; then 10if [ -s /etc/weekly.conf ]; then
11 . /etc/weekly.conf 11 . /etc/weekly.conf
12fi 12fi
13 13
14host="$(hostname)" 14host="$(hostname)"
15date="$(date)" 15date="$(date)"
16rcvar_manpage='weekly.conf(5)' 16rcvar_manpage='weekly.conf(5)'
@@ -69,37 +69,26 @@ TMP=weekly.$$ @@ -69,37 +69,26 @@ TMP=weekly.$$
69if checkyesno rebuild_locatedb; then 69if checkyesno rebuild_locatedb; then
70 echo "" 70 echo ""
71 if [ -f /var/db/locate.database ]; then 71 if [ -f /var/db/locate.database ]; then
72 echo "Rebuilding locate database:" 72 echo "Rebuilding locate database:"
73 chmod 644 /var/db/locate.database 73 chmod 644 /var/db/locate.database
74 chown nobody:nobody /var/db/locate.database 74 chown nobody:nobody /var/db/locate.database
75 (cd / && nice -5 su -m nobody -c /usr/libexec/locate.updatedb 2>/dev/null) 75 (cd / && nice -5 su -m nobody -c /usr/libexec/locate.updatedb 2>/dev/null)
76 chown root:wheel /var/db/locate.database 76 chown root:wheel /var/db/locate.database
77 else 77 else
78 echo "Not rebuilding locate database; no /var/db/locate.database" 78 echo "Not rebuilding locate database; no /var/db/locate.database"
79 fi 79 fi
80fi 80fi
81 81
82if checkyesno rebuild_whatisdb; then 
83 echo "" 
84 if [ -x /usr/libexec/makewhatis -a \( -f /etc/man.conf \ 
85 -o -d /usr/share/man \) ]; then 
86 echo "Rebuilding whatis databases:" 
87 nice -n 5 /usr/libexec/makewhatis -f 
88 else 
89 echo "Not rebuilding whatis databases" 
90 fi 
91fi 
92 
93if checkyesno rebuild_mandb; then 82if checkyesno rebuild_mandb; then
94 echo "" 83 echo ""
95 if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then 84 if [ -f /etc/man.conf -a -x /usr/sbin/makemandb ]; then
96 echo "Rebuilding man page index:" 85 echo "Rebuilding man page index:"
97 (umask 022; nice -n 5 /usr/sbin/makemandb -f -Q) 86 (umask 022; nice -n 5 /usr/sbin/makemandb -f -Q)
98 else 87 else
99 echo "Not rebuilding man page index" 88 echo "Not rebuilding man page index"
100 fi 89 fi
101fi 90fi
102 91
103if [ -f /etc/weekly.local ]; then 92if [ -f /etc/weekly.local ]; then
104 . /etc/weekly.local > $TMP 2>&1 93 . /etc/weekly.local > $TMP 2>&1
105 if [ -s $TMP ] ; then 94 if [ -s $TMP ] ; then

cvs diff -r1.4 -r1.5 src/etc/defaults/weekly.conf (expand / switch to unified diff)

--- src/etc/defaults/weekly.conf 2012/02/07 19:13:30 1.4
+++ src/etc/defaults/weekly.conf 2015/03/04 14:54:38 1.5
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
1# $NetBSD: weekly.conf,v 1.4 2012/02/07 19:13:30 joerg Exp $ 1# $NetBSD: weekly.conf,v 1.5 2015/03/04 14:54:38 christos Exp $
2# 2#
3# /etc/defaults/weekly.conf -- 3# /etc/defaults/weekly.conf --
4# default configuration of /etc/weekly.conf 4# default configuration of /etc/weekly.conf
5# 5#
6# see weekly.conf(5) for more information. 6# see weekly.conf(5) for more information.
7# 7#
8# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE. 8# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
9# EDIT /etc/weekly.conf INSTEAD. 9# EDIT /etc/weekly.conf INSTEAD.
10# 10#
11 11
12rebuild_locatedb=YES 12rebuild_locatedb=YES
13rebuild_whatisdb=NO 
14rebuild_mandb=YES 13rebuild_mandb=YES