svn commit: r347705 - in stable/11: sbin/reboot stand/i386/gptboot

[Ian Lepore]

Author: ian
Date: Thu May 16 15:32:03 2019
New Revision: 347705
URL: https://svnweb.freebsd.org/changeset/base/347705

Log:
  MFC r346968, r346973
  
  r346968:
  Update the manpage text to show the output generated by the first-stage
  bootloader these days (x86 instead of i386).
  
  r346973:
  Add a paragraph that mentions gptboot having an interactive mode, and
  direct the user to the boot(8) manpage, which provides the details on that.

Modified:
  stable/11/sbin/reboot/boot_i386.8
  stable/11/stand/i386/gptboot/gptboot.8
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sbin/reboot/boot_i386.8
==============================================================================
--- stable/11/sbin/reboot/boot_i386.8	Thu May 16 15:30:35 2019	(r347704)
+++ stable/11/sbin/reboot/boot_i386.8	Thu May 16 15:32:03 2019	(r347705)
@@ -36,7 +36,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 15, 2018
+.Dd April 30, 2019
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -95,7 +95,7 @@ program is documented separately.
 After the boot blocks have been loaded,
 you should see a prompt similar to the following:
 .Bd -literal
->> FreeBSD/i386 BOOT
+>> FreeBSD/x86 BOOT
 Default: 0:ad(0,a)/boot/loader
 boot:
 .Ed

Modified: stable/11/stand/i386/gptboot/gptboot.8
==============================================================================
--- stable/11/stand/i386/gptboot/gptboot.8	Thu May 16 15:30:35 2019	(r347704)
+++ stable/11/stand/i386/gptboot/gptboot.8	Thu May 16 15:32:03 2019	(r347705)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 5, 2014
+.Dd April 30, 2019
 .Dt GPTBOOT 8
 .Os
 .Sh NAME
@@ -39,6 +39,20 @@ is installed in a
 .Cm freebsd-boot
 partition with
 .Xr gpart 8 .
+.Pp
+When it starts,
+.Nm
+first reads the GPT and determines which drive and partition to
+boot from, as described under
+.Sx BOOTING ,
+below.
+If it does not find an eligible partition, or if the user hits a
+key within three seconds,
+.Nm
+switches from auto-boot to interactive mode.
+Interactive mode allows manual selection of the disk, partition,
+filename, and boot option flags, as described in
+.Xr boot 8 .
 .Sh IMPLEMENTATION NOTES
 The GPT standard allows a variable number of partitions, but
 .Nm