Date: Thu, 16 May 2019 15:30:35 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r347704 - in stable/12: sbin/reboot stand/i386/gptboot Message-ID: <201905161530.x4GFUZuq035204@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Thu May 16 15:30:35 2019 New Revision: 347704 URL: https://svnweb.freebsd.org/changeset/base/347704 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/12/sbin/reboot/boot_i386.8 stable/12/stand/i386/gptboot/gptboot.8 Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/reboot/boot_i386.8 ============================================================================== --- stable/12/sbin/reboot/boot_i386.8 Thu May 16 15:22:17 2019 (r347703) +++ stable/12/sbin/reboot/boot_i386.8 Thu May 16 15:30:35 2019 (r347704) @@ -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/12/stand/i386/gptboot/gptboot.8 ============================================================================== --- stable/12/stand/i386/gptboot/gptboot.8 Thu May 16 15:22:17 2019 (r347703) +++ stable/12/stand/i386/gptboot/gptboot.8 Thu May 16 15:30:35 2019 (r347704) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905161530.x4GFUZuq035204>