[src/netbsd-1-5]: src/sbin/shutdown pullup rev 1.20 from trunk (approved by t...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d0e27e80959
branches:  netbsd-1-5
changeset: 488717:8d0e27e80959
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Tue Jul 25 19:25:12 2000 +0000

description:
pullup rev 1.20 from trunk (approved by thorpej):
backoff rev. 1.17.10.1 - it's made obsolete by last rc.d changes and using
arbitrary hard time limit for /etc/rc.shutdown is not right anyway

diffstat:

 sbin/shutdown/shutdown.8 |  38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 deletions(-)

diffs (84 lines):

diff -r 1a6a59b6c4f3 -r 8d0e27e80959 sbin/shutdown/shutdown.8
--- a/sbin/shutdown/shutdown.8  Tue Jul 25 19:23:33 2000 +0000
+++ b/sbin/shutdown/shutdown.8  Tue Jul 25 19:25:12 2000 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: shutdown.8,v 1.17.10.1 2000/07/20 18:48:57 jdolecek Exp $
+.\"    $NetBSD: shutdown.8,v 1.17.10.2 2000/07/25 19:25:12 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 July 20, 2000
+.Dd January 20, 1998
 .Dt SHUTDOWN 8
 .Os
 .Sh NAME
@@ -42,7 +42,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Ddfhknpr
-.Op Fl T Ar timeout
 .Ar time
 .Op Ar message ... | Ar -
 .Sh DESCRIPTION
@@ -70,13 +69,6 @@
 .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
@@ -118,12 +110,12 @@
 .Nm
 execs
 .Xr reboot 8 .
-.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 Fl D
+Prevents
+.Nm
+from detaching from the tty with
+.Xr fork 2 /
+.Xr exit 3 .
 .It Ar time
 .Ar Time
 is the time at which
@@ -177,12 +169,8 @@
 Next a message is printed announcing the start of the system shutdown hooks.
 Then the shutdown hooks in
 .Pa /etc/rc.shutdown
-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.
+are run.
+And a message is printed indicating that they have completed.
 After a short delay a terminate
 signal is then sent to
 .Xr init 8
@@ -216,9 +204,3 @@
 .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 .