diff options
Diffstat (limited to 'sys/boot/common')
| -rw-r--r-- | sys/boot/common/help.common | 52 | ||||
| -rw-r--r-- | sys/boot/common/loader.8 | 50 |
2 files changed, 69 insertions, 33 deletions
diff --git a/sys/boot/common/help.common b/sys/boot/common/help.common index 6b148c1775eb6..f31580a09d9d1 100644 --- a/sys/boot/common/help.common +++ b/sys/boot/common/help.common @@ -2,7 +2,7 @@ # Thelp DDisplay command help help [topic [subtopic]] - ? + help index The help command displays help on commands and their usage. @@ -13,10 +13,12 @@ Some commands may not be available. Use the '?' command to list most available commands. - If needed, disable the use of ACPI with: +################################################################################ +# T? DList available commands - unset acpi_load - set hint.acpi.0.disabled="1" + ? + + Lists all available commands. ################################################################################ # Tautoboot DBoot after a delay @@ -38,6 +40,13 @@ kernel. ################################################################################ +# Tbcachestat DGet disk block cache stats + + bcachestat + + Displays statistics about disk cache usage. For depuration only. + +################################################################################ # Techo DEcho arguments echo [-n] [<message>] @@ -144,27 +153,52 @@ when the kernel is booted. ################################################################################ +# Tset Sboot_cdrom DMount root file system from CD-ROM + + set boot_cdrom + + Instructs the kernel to try to mount the root file system from CD-ROM. + +################################################################################ # Tset Sboot_ddb DDrop to the kernel debugger (DDB) set boot_ddb Instructs the kernel to start in the DDB debugger, rather than - proceeding to initialise when booted. + proceeding to initialize when booted. ################################################################################ -# Tset Sboot_gdb DSelect gdb-remote mode +# Tset Sboot_gdb DSelect gdb-remote mode for the kernel debugger set boot_gdb Selects gdb-remote mode for the kernel debugger by default. ################################################################################ +# Tset Sboot_multicons DUse multiple consoles + + set boot_multicons + + Enables multiple console support in the kernel early on boot. + In a running system, console configuration can be manipulated + by the conscontrol(8) utility. + +################################################################################ +# Tset Sboot_serial DUse serial console + + set boot_serial + + Force the use of a serial console even when an internal console + is present. + +################################################################################ # Tset Sboot_single DStart system in single-user mode set boot_single - Prevents the kernel from initiating a multi-user startup, single-user - mode will be entered when the kernel has finished device probes. + Prevents the kernel from initiating a multi-user startup; instead, + a single-user mode will be entered when the kernel has finished + device probes. ################################################################################ # Tset Sboot_verbose DVerbose boot messages @@ -217,7 +251,7 @@ Variable substitution is performed on the prompt. The default prompt can be set with: - set prompt=\$currdev> + set prompt=\${interpret} ################################################################################ # Tset Srootdev DSet the root filesystem diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 3b48453e7f292..6fb6b76af1fc7 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 18, 2004 +.Dd October 1, 2004 .Dt LOADER 8 .Os .Sh NAME @@ -131,7 +131,7 @@ interpreting mode. The builtin commands available are: .Pp .Bl -tag -width Ds -compact -.It Ic autoboot Op Ar seconds +.It Ic autoboot Op Ar seconds Op Ar prompt Proceeds to bootstrap the system after a number of seconds, if not interrupted by the user. Displays a countdown prompt @@ -269,9 +269,7 @@ Removes from the environment. .Pp .It Ic \&? -Same as -.Dq help index . -.Pp +Lists available commands. .El .Ss BUILTIN ENVIRONMENT VARIABLES The @@ -334,24 +332,37 @@ will be processed normally, defaulting to 10 seconds delay. .It Va boot_askname Instructs the kernel to prompt the user for the name of the root device when the kernel is booted. +.It Va boot_cdrom +Instructs the kernel to try to mount the root file system from CD-ROM. .It Va boot_ddb Instructs the kernel to start in the DDB debugger, rather than proceeding to initialize when booted. .It Va boot_gdb Selects gdb-remote mode for the kernel debugger by default. +.It Va boot_multicons +Enables multiple console support in the kernel early on boot. +In a running system, console configuration can be manipulated +by the +.Xr conscontrol 8 +utility. +.It Va boot_serial +Force the use of a serial console even when an internal console +is present. .It Va boot_single -Prevents the kernel from initiating a multi-user startup; instead single-user -mode will be entered when the kernel has finished device probing. +Prevents the kernel from initiating a multi-user startup; instead, +a single-user mode will be entered when the kernel has finished +device probing. .It Va boot_userconfig Requests that the kernel's interactive device configuration program be run when the kernel is booted. +Currently a no-op. .It Va boot_verbose Setting this variable causes extra debugging information to be printed by the kernel during the boot phase. .It Va bootfile List of semicolon-separated search path for bootable kernels. The default is -.Dq Li kernel;kernel.old . +.Dq Li kernel . .It Va console Defines the current console. .It Va currdev @@ -365,7 +376,7 @@ The default list is .Dq Li /sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall . .It Va interpret Has the value -.Dq Li ok +.Dq Li OK if the Forth's current state is interpreting. .It Va LINES Define the number of lines on the screen, to be used by the pager. @@ -384,7 +395,11 @@ Value of .Nm Ns 's prompt. Defaults to -.Dq Li "${currdev}>" . +.Dq Li "${interpret}" . +If variable +.Va prompt +is unset, the default prompt is +.Ql > . .It Va root_disk_unit If the code which detects the disk unit number for the root disk is confused, e.g.\& by a mix of SCSI and IDE disks, or IDE disks with @@ -398,13 +413,6 @@ when the kernel is booted. This can be overridden by setting .Va rootdev explicitly. -.It Va dumpdev -The name of a device where the kernel can save a crash dump in case -of a panic. -This automatically sets the -.Va kern.dumpdev -.Xr sysctl 3 -MIB variable. .El .Pp Other variables are used to override kernel tunable parameters. @@ -771,18 +779,12 @@ Boot in single user mode: .Pp .Dl boot -s .Pp -Load kernel's user configuration file. +Load the kernel, a splash screen, and then autoboot in five seconds. Notice that a kernel must be loaded before any other .Ic load command is attempted. .Bd -literal -offset indent load kernel -load -t userconfig_script /boot/kernel.conf -.Ed -.Pp -Load the kernel, a splash screen, and then autoboot in five seconds. -.Bd -literal -offset indent -load kernel load splash_bmp load -t splash_image_data /boot/chuckrulez.bmp autoboot 5 |