Merge in changes from at 2.9

1 files changed, 51 insertions, 60 deletions

diff --git a/libexec/atrun/atrun.8 b/libexec/atrun/atrun.8
index 33390e348dc..ef8eb1f0c4c 100644
--- a/libexec/atrun/atrun.8
+++ b/libexec/atrun/atrun.8
@@ -1,78 +1,69 @@
-.\"   $OpenBSD: atrun.8,v 1.2 1996/10/08 01:20:19 michaels Exp $
-.\"
-.\" Copyright (c) 1993 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$Id: atrun.8,v 1.2 1996/10/08 01:20:19 michaels Exp $
-.\"
-.Dd December 5, 1993
+.\" $OpenBSD: atrun.8,v 1.3 1997/03/01 23:39:43 millert Exp $
+.\" $FreeBSD: atrun.man,v 1.3 1997/02/22 14:20:55 peter Exp $
+.Dd April 12, 1995
 .Dt ATRUN 8
 .Os
 .Sh NAME
 .Nm atrun
 .Nd run jobs queued for later execution
-.\"
-.Sh SYOPSIS
+.Sh SYNOPSIS
 .Nm atrun
+.Op Fl l Ar load_avg
+.Op Fl d
 .Sh DESCRIPTION
-The
-.Nm atrun
-utility runs commands queued by
+.Nm Atrun
+runs jobs queued by
 .Xr at 1 .
-It is usually invoked by
+Root's
+.Xr crontab 5
+must contain the line:
+.nf
+
+*/10     *       *       *       *       root    /usr/libexec/atrun
+
+.fi
+so that
+.Xr atrun 8
+gets called every ten minutes.
+.Pp
+At every invocation, every job in lowercase queues whose starting time
+has passed is started.
+A maximum of one batch jobs (denoted by uppercase queues) are started
+each time
+.Nm atrun
+is invoked.
+.Sh OPTIONS
+.Bl -tag -width indent
+.It Fl l Ar load_avg
+Specifies a limiting load factor, over which batch jobs should
+not be run, instead of the compiled \- in value of 1.5.
+.It Fl d
+Debug; print error messages to standard error instead of using
+.Xr syslog 3 .
+.El
+.Sh WARNINGS
+For
+.Nm atrun
+to work, you have to start up a
 .Xr cron 8
-every ten minutes.
+daemon.
 .Sh FILES
-.Bl -tag -width /var/at/lockfile -compact
-.It Pa /var/at/jobs
-Directory containing job files
+.Bl -tag -width /var/at/spool -compact
 .It Pa /var/at/spool
 Directory containing output spool files
-.It Pa /var/at/lockfile
-Job-creation lock file.
+.It Pa /var/at/jobs
+Directory containing job files
 .El
 .Sh SEE ALSO
 .Xr cron 8 ,
-.Xr at 1
-.Sh AUTHOR
-.Bl -tag
-Thomas Koenig, ig25@rz.uni-karlsruhe.de
-.El
+.Xr crontab 1 ,
+.Xr crontab 5 ,
+.Xr at 1 ,
+.Xr syslog 3 .
 .Sh BUGS
-The functionality of
+The functionality of 
 .Nm atrun
-should arguaby be merged into
+should be merged into
 .Xr cron 8 .
-.Sh CAVEATS
-Since the default configuration causes
-.Nm atrun
-to be invoked every ten minutes,
-commands queued by
-.Xr at 1
-may end up being executed up to nine minutes
-later than would be otherwise expected.
+.Sh AUTHOR
+Thomas Koenig <ig25@rz.uni-karlsruhe.de>.