From e875630f871bb0f4149001b3ebfc9a5ca9a741de Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 15 Jan 2015 09:20:37 +0000 Subject: [PATCH] Extend the description of _timeout. --- share/man/man8/rc.d.8 | 15 ++++++++++++--- share/man/man8/rc.subr.8 | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/share/man/man8/rc.d.8 b/share/man/man8/rc.d.8 index 82f1d1d8346..9847434df80 100644 --- a/share/man/man8/rc.d.8 +++ b/share/man/man8/rc.d.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rc.d.8,v 1.26 2014/07/22 08:48:07 ajacoutot Exp $ +.\" $OpenBSD: rc.d.8,v 1.27 2015/01/15 09:20:37 ajacoutot Exp $ .\" .\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze .\" All rights reserved. @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 22 2014 $ +.Dd $Mdocdate: January 15 2015 $ .Dt RC.D 8 .Os .Sh NAME @@ -115,11 +115,20 @@ User to run the daemon as, using .Xr su 1 . .It Ar daemon Ns _timeout Maximum time in seconds to wait for the -.Cm start , +.Cm start +(only if +.Va rc_bg +is set), .Cm stop and .Cm reload actions to return. +This is only guaranteed with the default +.Ic rc_start , +.Ic rc_stop +and +.Ic rc_reload +functions. .El .Pp To obtain the actual variable names, replace diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 4f6cce78140..6b08bd504bd 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rc.subr.8,v 1.27 2014/09/22 16:27:03 schwarze Exp $ +.\" $OpenBSD: rc.subr.8,v 1.28 2015/01/15 09:20:37 ajacoutot Exp $ .\" .\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze .\" All rights reserved. @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 22 2014 $ +.Dd $Mdocdate: January 15 2015 $ .Dt RC.SUBR 8 .Os .Sh NAME @@ -234,11 +234,20 @@ User to run the daemon as, using .Xr su 1 . .It Va daemon_timeout Maximum time in seconds to wait for the -.Cm start , +.Cm start +(only if +.Va rc_bg +is set), .Cm stop and .Cm reload actions to return. +This is only guaranteed with the default +.Ic rc_start , +.Ic rc_stop +and +.Ic rc_reload +functions. .It Va daemon_class Login class to run the daemon with, using .Xr su 1 . -- 2.20.1