svn commit: r361900 - head/sbin/reboot

Conrad Meyer cem at FreeBSD.org
Mon Jun 8 00:46:19 UTC 2020


Author: cem
Date: Mon Jun  8 00:46:19 2020
New Revision: 361900
URL: https://svnweb.freebsd.org/changeset/base/361900

Log:
  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.

Modified:
  head/sbin/reboot/boot_i386.8

Modified: head/sbin/reboot/boot_i386.8
==============================================================================
--- head/sbin/reboot/boot_i386.8	Mon Jun  8 00:20:15 2020	(r361899)
+++ head/sbin/reboot/boot_i386.8	Mon Jun  8 00:46:19 2020	(r361900)
@@ -36,7 +36,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 19, 2019
+.Dd June 7, 2020
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -61,31 +61,13 @@ 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


More information about the svn-src-all mailing list