diff options
-rw-r--r-- | usr.sbin/periodic/periodic.8 | 4 | ||||
-rw-r--r-- | usr.sbin/periodic/periodic.sh | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8 index e5aab0c..19ae3af 100644 --- a/usr.sbin/periodic/periodic.8 +++ b/usr.sbin/periodic/periodic.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: periodic.8,v 1.7 1998/03/23 08:26:50 charnier Exp $ +.\" $Id: periodic.8,v 1.8 1998/12/29 22:45:15 hoek Exp $ .\" .Dd 13 August 1997 .Os FreeBSD 3.0 @@ -86,7 +86,7 @@ The top level directory containing and .Pa monthly subdirectories which contain standard system periodic executables. -.It Pa /etc/rc.conf +.It Pa /etc/defaults/rc.conf The .Pa rc.conf system registry contains a variable diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index 08b3c70..b195bf8 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: periodic.sh,v 1.6 1998/12/29 22:48:54 hoek Exp $ +# $Id: periodic.sh,v 1.7 1999/01/01 17:37:33 billf Exp $ # # Run nightly periodic scripts # @@ -18,8 +18,11 @@ if [ $# -lt 1 ] ; then usage fi -# If possible, check /etc/rc.conf to see if there are additional dirs to check -if [ -r /etc/rc.conf ] ; then +# If possible, check the global system configuration file, +# to see if there are additional dirs to check +if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -r /etc/rc.conf ]; then . /etc/rc.conf fi |