summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/init/init.856
1 files changed, 32 insertions, 24 deletions
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 695b14a0bb5..f295e8bddbd 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: init.8,v 1.45 2010/10/15 08:04:01 jmc Exp $
+.\" $OpenBSD: init.8,v 1.46 2011/05/10 18:21:29 schwarze Exp $
.\" $NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -33,7 +33,7 @@
.\"
.\" @(#)init.8 8.6 (Berkeley) 5/26/95
.\"
-.Dd $Mdocdate: October 15 2010 $
+.Dd $Mdocdate: May 10 2011 $
.Dt INIT 8
.Os
.Sh NAME
@@ -48,37 +48,35 @@ The
program
is the last stage of the boot process.
It normally executes the sequence of events described in
-.Xr rc 8 ,
-and if this succeeds, begins multi-user operation.
-If the boot scripts fail,
-.Nm
-commences single-user operation by giving
-the superuser a shell on the console.
-The
-.Nm
-program may be passed parameters
-from the boot program to
-prevent the system from going multi-user and to instead execute
-a single-user shell without starting the normal daemons.
+.Xr rc 8
+and begins multi-user operation.
.Pp
-The following parameters may be passed from the boot program:
+The kernel may pass the following options to
+.Nm ,
+usually when requested by the
+.Xr boot 8
+program:
.Bl -tag -width Ds
.It Fl f
Activate fastboot mode.
+This is not currently supported by the
+.Ox
+kernel.
+Instead, use the
+.Pa /fastboot
+file as explained in the
+.Xr rc 8
+manual.
.It Fl s
Boot directly into single user mode.
.El
.Pp
-The system is then quiescent for maintenance work and may
-later be made to go to multi-user by exiting the
-single-user shell (with ^D).
-This
-causes
-.Nm
-to run the
-.Pa /etc/rc
-startup command file in fastboot mode (skipping disk checks).
+Single-user mode is also entered if the boot scripts fail.
.Pp
+In single-user mode, the
+.Xr rc 8
+script is not run and normal daemons are not started,
+but instead a super-user shell is started on the system console.
If the
.Ar console
entry in the
@@ -94,6 +92,16 @@ The password check is skipped if the
is marked as
.Dq secure .
.Pp
+In single-user mode, the system is quiescent for maintenance work and may
+later be made to go to multi-user by exiting the
+single-user shell (with ^D).
+This
+causes
+.Nm
+to run the
+.Xr rc 8
+startup command file in fastboot mode (skipping disk checks).
+.Pp
The kernel
.Xr securelevel 7
is normally set to 0 while in single-user mode, and raised to 1 when