summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2011-03-25 10:03:27 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2011-03-25 10:03:27 +0000
commitf413c7b6ba164b0760742257a5b7740c7709e1bf (patch)
tree28fd35ad210914d43fe80d6a86f9a84e42e8f267
parent33db560b76a74f74f2af397a24e31065fb0ac933 (diff)
Bump timeout to 30s.
ok robert@
-rw-r--r--etc/rc.d/rc.subr4
-rw-r--r--share/man/man8/rc.subr.86
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index 24d9eca9212..e6a0556f523 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.29 2011/03/24 07:28:31 robert Exp $
+# $OpenBSD: rc.subr,v 1.30 2011/03/25 10:03:26 ajacoutot Exp $
# Default functions and variables used by rc.d(8) scripts.
@@ -39,7 +39,7 @@ rc_print() {
rc_wait() {
i=0
- while [ $i -lt 5 ]; do
+ while [ $i -lt 30 ]; do
rc_do rc_check || return 0
sleep 1
i=$((i+1))
diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8
index 1a9e9891627..da0eb591a6b 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.16 2011/03/23 20:43:43 schwarze Exp $
+.\" $OpenBSD: rc.subr.8,v 1.17 2011/03/25 10:03:26 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: March 23 2011 $
+.Dd $Mdocdate: March 25 2011 $
.Dt RC.SUBR 8
.Os
.Sh NAME
@@ -149,7 +149,7 @@ Check that the service is running by calling
If it is running,
call
.Fn rc_stop
-and wait up to 5 seconds for the daemon to properly shutdown.
+and wait up to 30 seconds for the daemon to properly shutdown.
If successful, run
.Fn rc_post
if it exists.