summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-04-08 08:53:09 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-04-08 08:53:09 +0000
commitb8d6760607555f8a86a3d61f4b160d2e81c89a1e (patch)
tree5db7dde78d719307f6fdfe5513d418b54cef769d
parent934489350cfb362dfd35405e247e317f34eb9920 (diff)
document "powerdown" in rc.shutdown;
based on diffs from henning, and ok him too...
-rw-r--r--sbin/reboot/reboot.814
-rw-r--r--share/man/man8/rc.shutdown.827
2 files changed, 32 insertions, 9 deletions
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index e62c413e6f5..10244858236 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: reboot.8,v 1.34 2005/12/09 16:42:11 jmc Exp $
+.\" $OpenBSD: reboot.8,v 1.35 2006/04/08 08:53:08 jmc Exp $
.\" $NetBSD: reboot.8,v 1.3 1995/10/05 05:36:21 mycroft Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -72,6 +72,10 @@ Causes the system to power down, if it is being halted, and the
hardware supports automatic power down.
(Currently supported on some i386, luna88k, mac68k, macppc,
sparc, sparc64 and zaurus platforms.)
+.Pp
+See also the description of
+.Va powerdown ,
+below.
.It Fl q
Quick.
The system is halted or restarted quickly and ungracefully, and only
@@ -86,7 +90,13 @@ users advance warning of their impending doom.
.Sh FILES
.Bl -tag -width /etc/rc.shutdown -compact
.It Pa /etc/rc.shutdown
-script which is run at shutdown time
+Script which is run at shutdown time.
+If it sets the variable
+.Va powerdown
+to
+.Dq YES ,
+.Nm halt
+will attempt to power down the machine after it has halted.
.El
.Sh SEE ALSO
.Xr reboot 2 ,
diff --git a/share/man/man8/rc.shutdown.8 b/share/man/man8/rc.shutdown.8
index fe61cfd1f84..d99ed86dc3b 100644
--- a/share/man/man8/rc.shutdown.8
+++ b/share/man/man8/rc.shutdown.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rc.shutdown.8,v 1.6 2003/10/24 08:15:43 jmc Exp $
+.\" $OpenBSD: rc.shutdown.8,v 1.7 2006/04/08 08:53:07 jmc Exp $
.\"
.\" Copyright (c) 1999 Aaron Campbell
.\" All rights reserved.
@@ -35,18 +35,31 @@ When the system is administratively shut down using either the
.Xr reboot 8
or
.Xr halt 8
-command, either of these programs checks for the existence of a
+command,
+.Xr rc 8
+is invoked with the argument
+.Dq shutdown ,
+which checks for the existence of a
.Pa /etc/rc.shutdown
script to run before halting the system.
-It will also be executed by
+This script, like
+.Xr rc.local 8 ,
+is entirely for commands added by the system administrator.
+.Pp
+The
+.Nm
+script is also executed by
.Xr init 8
if a keyboard-requested halt is issued (for architectures that support this).
.Pp
-The
+If
.Nm
-script, like
-.Xr rc.local 8 ,
-is entirely for commands added by the system administrator.
+sets the variable
+.Va powerdown
+to
+.Dq YES ,
+.Xr halt 8
+will attempt to power down the machine after it has halted.
.Sh SEE ALSO
.Xr halt 8 ,
.Xr init 8 ,