From 94021a19a5ec4b59b85c4955f2480ed4301de313 Mon Sep 17 00:00:00 2001
From: jdolecek <jdolecek@NetBSD.org>
Date: Thu, 20 Jul 2000 17:33:56 +0000
Subject: [PATCH] when running /etc/rc.shutdown, don't wait on it until it
 completes indefinitely - by default, wait maximum of 300 seconds only the
 timeout is settable via new -T flag Adjust history to mention addition of
 shutdown hooks and -T option on manpage, also move description of -D further
 up and slighly adjust.

This fixes bin/10637.
---
 sbin/shutdown/shutdown.8 | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 3857eca99270..79016cccd558 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: shutdown.8,v 1.17 1998/10/29 20:12:56 bad Exp $
+.\"	$NetBSD: shutdown.8,v 1.18 2000/07/20 17:33:57 jdolecek Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)shutdown.8	8.2 (Berkeley) 4/27/95
 .\"
-.Dd January 20, 1998
+.Dd July 20, 2000
 .Dt SHUTDOWN 8
 .Os
 .Sh NAME
@@ -42,6 +42,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Ddfhknpr
+.Op Fl T
+.Ar timeout
 .Ar time
 .Op Ar message ... | Ar -
 .Sh DESCRIPTION
@@ -69,6 +71,13 @@ flags are specified, then
 .Fl d
 also implies
 .Fl r .
+.It Fl D
+Prevents
+.Nm
+from detaching from the tty with
+.Xr fork 2
+and
+.Xr exit 3 .
 .It Fl f
 .Nm
 arranges, in the manner of
@@ -110,12 +119,12 @@ when
 .Nm
 execs
 .Xr reboot 8 .
-.It Fl D
-Prevents
-.Nm
-from detaching from the tty with
-.Xr fork 2 /
-.Xr exit 3 .
+.It Fl T
+Timeout in seconds to wait for
+.Pa /etc/rc.shutdown
+to finish. After
+this period, the script is killed and system shutdown proceeds.
+Default is 300 seconds (5 minutes).
 .It Ar time
 .Ar Time
 is the time at which
@@ -169,8 +178,12 @@ time of shutdown, who initiated the shutdown and the reason.
 Next a message is printed announcing the start of the system shutdown hooks.
 Then the shutdown hooks in
 .Pa /etc/rc.shutdown
-are run.
-And a message is printed indicating that they have completed.
+are run. If they don't complete within timeout (see
+.Fl T ,
+default 5 minutes), the script is killed and
+.Nm
+proceeds with system shutdown.
+In either case, a message is printed indicating that they have completed.
 After a short delay a terminate
 signal is then sent to
 .Xr init 8
@@ -204,3 +217,9 @@ The
 .Nm
 command appeared in
 .Bx 4.0 .
+Running of shutdown hooks in
+.Pa /etc/rc.shutdown
+and
+.Fl T
+option have been added in
+.Nx 1.5 .