aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorConrad Meyer <cem@FreeBSD.org>2020-06-08 00:46:19 +0000
committerConrad Meyer <cem@FreeBSD.org>2020-06-08 00:46:19 +0000
commitb68e92ff60661a6c06f6bf288db58c0cd96ae1bb (patch)
treec446bb385b25c7d6de44d607b2c4e0f7f2a08fca /sbin
parent15824a4c06fbdd28b9732a1faa080b54ace2b74a (diff)
downloadsrc-b68e92ff60661a6c06f6bf288db58c0cd96ae1bb.tar.gz
src-b68e92ff60661a6c06f6bf288db58c0cd96ae1bb.zip
x86 boot.8: Remove obsolescent non-loader x86 boot documentation
x86 boot uses loader(8) and the boot2-direct-to-kernel process is not supported. Remove the documentation, which doesn't document a working process and leads to confusion. PR: 247074 Reported by: Alex K.
Notes
Notes: svn path=/head/; revision=361900
Diffstat (limited to 'sbin')
-rw-r--r--sbin/reboot/boot_i386.826
1 files changed, 4 insertions, 22 deletions
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 2974efd473e1..7f1699c9488f 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -36,7 +36,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd November 19, 2019
+.Dd June 7, 2020
.Dt BOOT 8 i386
.Os
.Sh NAME
@@ -61,32 +61,14 @@ That process is described
in
.Xr uefi 8 .
.Pp
-By default, a three-stage bootstrap is employed, and control is
-automatically passed from the boot blocks (bootstrap stages one and
-two) to a separate third-stage bootstrap program,
+A three-stage bootstrap is employed.
+Control is passed from the boot blocks (bootstrap stages one and two) to a
+third-stage bootstrap program,
.Xr loader 8 .
This third stage provides more sophisticated control over the booting
process than it is possible to achieve in the boot blocks, which are
constrained by occupying limited fixed space on a given disk or slice.
.Pp
-However, it is possible to dispense with the third stage altogether,
-either by specifying a kernel name in the boot block parameter
-file,
-.Pa /boot.config ,
-or, unless option
-.Fl n
-is set, by hitting a key during a brief pause (while one of the characters
-.Sy - ,
-.Sy \e ,
-.Sy \&| ,
-or
-.Sy /
-is displayed) before
-.Xr loader 8
-is invoked.
-Booting will also be attempted at stage two, if the
-third stage cannot be loaded.
-.Pp
The remainder of this subsection deals only with the boot blocks.
The
.Xr loader 8