diff options
| author |   tom <tom@openbsd.org> | 2004-03-11 14:43:44 +0000 |
|---|---|---|
| committer | tom <tom@openbsd.org> | 2004-03-11 14:43:44 +0000 |
| commit | ac8ad87d9e1223c121dd1882a398b33daeae2d96 (patch) | |
| tree | 5a802726a4a88987597bb6f1a4f8b3528e43c02c | |
| parent | Shutdown the RDE cleanly on exit. Plug some memleaks. OK henning@ (diff) | |
| download | wireguard-openbsd-ac8ad87d9e1223c121dd1882a398b33daeae2d96.tar.xz wireguard-openbsd-ac8ad87d9e1223c121dd1882a398b33daeae2d96.zip | |
Document RB_USERREQ
ok beck@, jmc@, deraadt@
| -rw-r--r-- | lib/libc/sys/reboot.2 | 22 | ||||
| -rw-r--r-- | share/man/man9/boot.9 | 12 |
2 files changed, 30 insertions, 4 deletions
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2 index 6d26fef7bd5..d830f850372 100644 --- a/lib/libc/sys/reboot.2 +++ b/lib/libc/sys/reboot.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: reboot.2,v 1.11 2004/01/23 23:08:46 jmc Exp $ +.\" $OpenBSD: reboot.2,v 1.12 2004/03/11 14:43:44 tom Exp $ .\" $NetBSD: reboot.2,v 1.5 1995/02/27 12:36:02 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -84,6 +84,22 @@ If used in conjunction with .Dv RB_HALT , and if the system hardware supports the function, the system will be powered off. +.It Dv RB_USERREQ +By default, the system will halt if +.Fn reboot +is called during startup (before the system has finished autoconfiguration), +even if +.Dv RB_HALT +is not specified. +This is because +.Xr panic 9 s +during startup will probably just repeat on the next boot. +Use of this option implies that the user has requested the action +specified (for example, using the +.Xr ddb 4 +.Ic boot reboot +command), +so the system will reboot if a halt is not explicitly requested. .It Dv RB_INITNAME An option allowing the specification of an init program (see .Xr init 8 ) @@ -147,7 +163,9 @@ The caller is not the superuser. .Xr halt 8 , .Xr init 8 , .Xr reboot 8 , -.Xr savecore 8 +.Xr savecore 8 , +.Xr boot 9 , +.Xr panic 9 .Sh HISTORY The .Fn reboot diff --git a/share/man/man9/boot.9 b/share/man/man9/boot.9 index f29a9ad144f..597ea0ebc2b 100644 --- a/share/man/man9/boot.9 +++ b/share/man/man9/boot.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot.9,v 1.5 2000/10/12 18:05:58 aaron Exp $ +.\" $OpenBSD: boot.9,v 1.6 2004/03/11 14:43:44 tom Exp $ .\" $NetBSD: boot.9,v 1.1 1995/11/25 21:24:48 perry Exp $ .\" .\" Copyright (c) 1994 Christopher G. Demetriou @@ -99,8 +99,16 @@ If the system has not finished autoconfiguration, .Fn boot runs any shutdown hooks by calling .Xr doshutdownhooks 9 , -prints a message, and halts the system. +prints a message, and halts the system +(unless +.Dv RB_USERREQ +is specified, in which case the system will be halted if +.Dv RB_HALT +is given, and rebooted otherwise; see +.Xr reboot 2 +for more details). .Sh SEE ALSO +.Xr reboot 2 , .Xr doshutdownhooks 9 , .Xr resettodr 9 , .Xr vfs_shutdown 9 |