diff options
| author | brian <brian@FreeBSD.org> | 2000-06-23 01:18:31 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2000-06-23 01:18:31 +0000 |
| commit | 567e3fdcca0faa8172592279ac0456abbbcefc73 (patch) | |
| tree | 77123bc5d54c8b955e70336abe11b0e381d8a9cb /usr.sbin/periodic | |
| parent | 5c86744d35958722a77ae5346e0c2ee161efd003 (diff) | |
| download | FreeBSD-src-567e3fdcca0faa8172592279ac0456abbbcefc73.zip FreeBSD-src-567e3fdcca0faa8172592279ac0456abbbcefc73.tar.gz | |
Introduce /etc/defaults/periodic.conf, similar in concept to rc.conf.
The only change in the default functionality should be that
the output reports are slightly more verbose WRT files deleted.
Not objected to by: freebsd-arch
Diffstat (limited to 'usr.sbin/periodic')
| -rw-r--r-- | usr.sbin/periodic/periodic.8 | 13 | ||||
| -rw-r--r-- | usr.sbin/periodic/periodic.sh | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8 index 97957ac..4d3d3ea 100644 --- a/usr.sbin/periodic/periodic.8 +++ b/usr.sbin/periodic/periodic.8 @@ -86,9 +86,9 @@ The top level directory containing and .Pa monthly subdirectories which contain standard system periodic executables. -.It Pa /etc/defaults/rc.conf +.It Pa /etc/defaults/periodic.conf The -.Pa rc.conf +.Pa periodic.conf system registry contains a variable .Va local_periodic which may be configured to specify additional top level standard @@ -107,14 +107,17 @@ similar to the following example: .Dl 0 3 * * 6 root periodic weekly 2>&1 .Dl 0 5 1 * * root periodic monthly 2>&1 .Pp -Additionally, the system registry will typically have a +Additionally, the +.Pa /etc/defaults/periodic.conf +system registry will typically have a .Va local_periodic variable reading: -.Dl local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # periodic script dirs +.Pp +.Dl local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" .Sh SEE ALSO .Xr sh 1 , .Xr crontab 5 , -.Xr rc.conf 5 , +.Xr periodic.conf 5 , .Xr cron 8 .Rs .Sh DIAGNOSTICS diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index 479228b..7141710 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -20,11 +20,9 @@ fi # 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 - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf +if [ -r /etc/defaults/periodic.conf ]; then + . /etc/defaults/periodic.conf + source_periodic_confs fi dir=$1 |
