- Move descriptions of BOOT_COMCONSOLE_PORT, BOOT_COMCONSOLE_SPEED,

  and LOADER_TFTP_SUPPORT options into the world section since boot
  blocks are built as part of the world.

- Document BOOT_PXELDR_ALWAYS_SERIAL and BOOT_PXELDR_PROBE_KEYBOARD
  options of pxeboot(8).

MFC after:	3 days

1 files changed, 44 insertions, 24 deletions

diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index b69a266..5d3d300 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 21, 2006
+.Dd September 5, 2006
 .Dt MAKE.CONF 5
 .Os
 .Sh NAME
@@ -332,14 +332,6 @@ The value is approximately milliseconds.
 Keypresses are accepted by the BIOS before booting from disk,
 making it possible to give custom boot parameters even when this is
 set to 0.
-.It Va BOOT_COMCONSOLE_PORT
-.Pq Vt str
-The port address to use for the console if the boot blocks have
-been configured to use a serial console instead of the keyboard/video card.
-.It Va BOOT_COMCONSOLE_SPEED
-.Pq Vt int
-The baud rate to use for the console if the boot blocks have
-been configured to use a serial console instead of the keyboard/video card.
 .It Va COPTFLAGS
 .Pq Vt str
 Controls the compiler settings when building the
@@ -367,21 +359,6 @@ and install the kernel specified by the config file
 .Pa MINE .
 It defaults to
 .Pa GENERIC .
-.It Va LOADER_TFTP_SUPPORT
-.Pq Vt bool
-While not a buildkernel-affected option, there is no better place for this.
-By default the
-.Xr pxeboot 8
-loader retrieves the kernel via NFS.
-Defining this and recompiling
-.Pa /usr/src/sys/boot
-will cause it to retrieve the kernel via TFTP.
-This allows
-.Xr pxeboot 8
-to load a custom BOOTP diskless kernel yet
-still mount the server's
-.Pa /
-rather than load the server's kernel.
 .It Va MODULES_OVERRIDE
 .Pq Vt str
 Set to a list of modules to build instead of all of them.
@@ -419,6 +396,35 @@ This is applied
 The following list provides a name and short description for variables
 that are used during the world build:
 .Bl -tag -width Ar
+.It Va BOOT_COMCONSOLE_PORT
+.Pq Vt str
+The port address to use for the console if the boot blocks have
+been configured to use a serial console instead of the keyboard/video card.
+.It Va BOOT_COMCONSOLE_SPEED
+.Pq Vt int
+The baud rate to use for the console if the boot blocks have
+been configured to use a serial console instead of the keyboard/video card.
+.It Va BOOT_PXELDR_ALWAYS_SERIAL
+.Pq Vt bool
+Compile in the code into
+.Xr pxeboot 8
+that forces the use of a serial console.
+This is analogous to the
+.Fl h
+option in
+.Xr boot 8
+blocks.
+.It Va BOOT_PXELDR_PROBE_KEYBOARD
+.Pq Vt bool
+Compile in the code into
+.Xr pxeboot 8
+that probes the keyboard.
+If no keyboard is found, boot with the dual console configuration.
+This is analogous to the
+.Fl D
+option in
+.Xr boot 8
+blocks.
 .It Va ENABLE_SUID_K5SU
 .Pq Vt bool
 Set this if you wish to use the ksu utility.
@@ -437,6 +443,20 @@ will not be able to change users' groups.
 Set this to install
 .Xr ssh 1
 with the set-user-ID bit turned on.
+.It Va LOADER_TFTP_SUPPORT
+.Pq Vt bool
+By default the
+.Xr pxeboot 8
+loader retrieves the kernel via NFS.
+Defining this and recompiling
+.Pa /usr/src/sys/boot
+will cause it to retrieve the kernel via TFTP.
+This allows
+.Xr pxeboot 8
+to load a custom BOOTP diskless kernel yet
+still mount the server's
+.Pa /
+rather than load the server's kernel.
 .It Va MODULES_WITH_WORLD
 .Pq Vt bool
 Set to build modules with the system instead of the kernel.