diff options
| -rw-r--r-- | sys/boot/alpha/common/help.alpha | 25 | ||||
| -rw-r--r-- | sys/boot/common/help.common | 52 | ||||
| -rw-r--r-- | sys/boot/common/loader.8 | 50 | ||||
| -rw-r--r-- | sys/boot/forth/loader.4th.8 | 4 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 51 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf.5 | 7 | ||||
| -rw-r--r-- | sys/boot/i386/loader/help.i386 | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/loader/help.pc98 | 2 |
8 files changed, 133 insertions, 60 deletions
diff --git a/sys/boot/alpha/common/help.alpha b/sys/boot/alpha/common/help.alpha index e69de29bb2d1d..ce30524bd6e66 100644 --- a/sys/boot/alpha/common/help.alpha +++ b/sys/boot/alpha/common/help.alpha @@ -0,0 +1,25 @@ +$FreeBSD$ + +################################################################################ +# Treboot DReboot the system + + reboot + + Causes the system to immediately reboot. + +################################################################################ +# Thalt DHalt the system + + halt + + Causes the system to halt. + +################################################################################ +# Theap DDisplay memory management statistics + + heap + + Requests debugging output from the heap manager. For debugging use + only. + +################################################################################ 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 diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8 index d5cf383814a3d..0e1872453c7d1 100644 --- a/sys/boot/forth/loader.4th.8 +++ b/sys/boot/forth/loader.4th.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 25, 1999 +.Dd September 30, 2004 .Dt LOADER.4TH 8 .Os .Sh NAME @@ -183,7 +183,7 @@ start Load a different kernel with the standard configuration: .Pp .Bd -literal -offset indent -compact -set kernel="/boot/kernel.old/kernel" +set kernel="kernel.old" unload boot-conf .Ed diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index d5516d98e7d82..450ea43b9087b 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -16,11 +16,7 @@ exec=".( Loading /boot/defaults/loader.conf ) cr" kernel="kernel" # /boot sub-directory containing kernel and modules bootfile="kernel" # Kernel name (possibly absolute path) -kernel_options="" - -userconfig_script_load="NO" -userconfig_script_name="/boot/kernel.conf" -userconfig_script_type="userconfig_script" +kernel_options="" # Flags to be passed to the kernel loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" nextboot_conf="/boot/nextboot.conf" @@ -62,14 +58,17 @@ module_path="/boot/modules" # Set the module search path # The following boot_ variables are enabled # by setting them to any value. #boot_askname="" # Prompt the user for the name of the root device +#boot_cdrom="" # Attempt to mount root file system from CD-ROM #boot_ddb="" # Instructs the kernel to start in the DDB debugger #boot_gdb="" # Selects gdb-remote mode for the kernel debugger +#boot_multicons="" # Use multiple consoles +#boot_serial="" # Use serial console #boot_single="" # Start system in single-user mode -#boot_userconfig="" # Run kernel's interactive device configuration program +#boot_userconfig="" # Run kernel's interactive device configuration program; + # currently a no-op #boot_verbose="" # Causes extra debugging information to be printed #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall" # Sets the list of init candidates -#dumpdev="ad0s1b" # Set device for crash dumps ############################################################## @@ -118,19 +117,21 @@ coda_load="NO" # CODA filesystem fdescfs_load="NO" # Filedescriptors filesystem linprocfs_load="NO" # Linux compatibility process filesystem msdosfs_load="NO" # FAT-12/16/32 -nfs_load="NO" # NFS +nfsclient_load="NO" # NFS client +nfsserver_load="NO" # NFS server ntfs_load="NO" # NTFS nullfs_load="NO" # Null filesystem portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem -umapfs_load="NO" # User-id map filesystem +#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem # Related stuff -ccd_load="NO" # Concatenated disk driver +geom_ccd_load="NO" # Concatenated disk driver vinum_load="NO" # Concatenated/mirror/raid driver -md_load="NO" # Memory disk driver (vnode/swap/malloc) +geom_vinum_load="NO" # Concatenated/mirror/raid driver +g_md_load="NO" # Memory disk driver (vnode/swap/malloc) ############################################################## @@ -147,8 +148,6 @@ screensave_name="green_saver" # Set to the name of the screensaver module ### Emulation modules ###################################### ############################################################## -fpu_load="NO" # Floating point emulation -gnufpu_load="NO" # GNU floating point emulation ibcs2_load="NO" # IBCS2 (SCO) emulation ibcs2_coff_load="NO" linux_load="NO" # Linux emulation @@ -183,6 +182,7 @@ miibus_load="NO" # miibus support, needed for some drivers if_an_load="NO" # Aironet 4500/4800 802.11 wireless NICs if_ar_load="NO" # Digi SYNC/570i if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs +if_bfe_load="NO" # Broadcom BCM4401 if_bge_load="NO" # Broadcom BCM570x PCI gigabit ethernet if_cm_load="NO" # SMC (90c26, 90c56, 90c66) if_dc_load="NO" # DEC/Intel 21143 and various workalikes @@ -204,6 +204,7 @@ if_nge_load="NO" # National Semiconductor PCI gigabit ethernet if_oltr_load="NO" # Olicom if_pcn_load="NO" # AMD PCnet PCI if_ray_load="NO" # Raytheon Raylink/Webgear Aviator PCCard +if_re_load="NO" # RealTek 8139C+/8169/8169S/8110S if_rl_load="NO" # RealTek 8129/8139 if_sbni_load="NO" # Granch SBNI12 leased line adapters if_sf_load="NO" # Adaptec Duralink PCI (AIC-6915 "starfire") @@ -216,6 +217,7 @@ if_ti_load="NO" # Alteon Networks Tigon 1 and Tigon 2 if_tl_load="NO" # Texas Instruments TNETE100 ("ThunderLAN") if_tx_load="NO" # SMC 83c17x fast ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) +if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet if_vr_load="NO" # VIA Rhine I and Rhine II if_vx_load="NO" # 3Com 3C590 family if_wb_load="NO" # Winbond W89C840F @@ -234,22 +236,34 @@ ng_bpf_load="NO" # Berkeley packet filter netgraph node type ng_bridge_load="NO" # Ethernet bridging netgraph node type ng_cisco_load="NO" # Cisco HDLC protocol netgraph node type ng_echo_load="NO" # Netgraph echo node type +ng_eiface_load="NO" # generic Ethernet interface netgraph node type +ng_etf_load="NO" # Ethertype filtering netgraph node type ng_ether_load="NO" # Ethernet netgraph node type +ng_fec_load="NO" # netgraph Fast EtherChannel node ng_frame_relay_load="NO" # frame relay netgraph node type +ng_gif_load="NO" # generic tunnel interface netgraph node type +ng_gif_demux_load="NO" # demultiplexer for packets from ng_gif(4) nodes ng_hole_load="NO" # Netgraph discard node type +ng_hub_load="NO" # packet distribution netgraph node type ng_iface_load="NO" # interface Netgraph node type +ng_ip_input_load="NO" # netgraph IP input node type ng_ksocket_load="NO" # kernel socket netgraph node type +ng_l2tp_load="NO" # L2TP protocol netgraph node type ng_lmi_load="NO" # frame relay LMI protocol netgraph node type ng_mppc_load="NO" # Microsoft MPPC/MPPE compression and encryption netgraph node type +ng_netflow_load="NO" # Cisco's NetFlow netgraph note type ng_one2many_load="NO" # packet multiplexing netgraph node type ng_ppp_load="NO" # PPP protocol netgraph node type ng_pppoe_load="NO" # RFC 2516 PPPOE protocol netgraph node type ng_pptpgre_load="NO" # PPTP GRE protocol netgraph node type ng_rfc1490_load="NO" # RFC 1490 netgraph node type ng_socket_load="NO" # Netgraph socket node type +ng_split_load="NO" # netgraph node to separate incoming and outgoing flows +ng_sppp_load="NO" # sppp netgraph node type ng_tee_load="NO" # Netgraph ``tee'' node type ng_tty_load="NO" # Netgraph node type that is also a line discipline ng_vjc_load="NO" # Van Jacobsen compression netgraph node type +ng_vlan_load="NO" # IEEE 802.1Q VLAN tagging netgraph node type ############################################################## ### Sound modules ########################################## @@ -257,26 +271,28 @@ ng_vjc_load="NO" # Van Jacobsen compression netgraph node type sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 +snd_als4000_load="NO" # als4000 snd_cmi_load="NO" # cmi -snd_csa_load="NO" # csa snd_cs4281_load="NO" # cs4281 +snd_csa_load="NO" # csa snd_ds1_load="NO" # ds1 snd_emu10k1_load="NO" # Creative Sound Blaster Live -snd_ess_load="NO" # ess snd_es137x_load="NO" # es137x +snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 snd_ich_load="NO" # Intel ICH snd_maestro_load="NO" # Maestro snd_maestro3_load="NO" # Maestro3 snd_mss_load="NO" # Mss snd_neomagic_load="NO" # Neomagic -snd_sbc_load="NO" # Sbc -snd_sb8_load="NO" # Sound Blaster Pro snd_sb16_load="NO" # Sound Blaster 16 +snd_sb8_load="NO" # Sound Blaster Pro +snd_sbc_load="NO" # Sbc snd_solo_load="NO" # Solo snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 +snd_vibes_load="NO" # vibes snd_driver_load="NO" # All sound drivers ############################################################## @@ -298,6 +314,7 @@ if_aue_load="NO" # ADMtek USB ethernet if_axe_load="NO" # ASIX Electronics AX88172 USB ethernet if_cue_load="NO" # CATC USB ethernet if_kue_load="NO" # Kawasaki LSI USB ethernet +snd_uaudio_load="NO" # USB audio ############################################################## ### Other modules ########################################## diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5 index 350a082aba401..387d5758c159e 100644 --- a/sys/boot/forth/loader.conf.5 +++ b/sys/boot/forth/loader.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd April 18, 1999 +.Dd September 30, 2004 .Dt LOADER.CONF 5 .Os .Sh NAME @@ -189,11 +189,6 @@ If set to .Dq YES , will load the splash screen module, making it possible to display a pcx image on the screen while booting. -.It Va userconfig_script_load -.Pq Dq NO -If set to -.Dq YES , -will load the userconfig data. .It Va vesa_load .Pq Dq NO If set to diff --git a/sys/boot/i386/loader/help.i386 b/sys/boot/i386/loader/help.i386 index 16e0fd3f92f78..c93db94ea161b 100644 --- a/sys/boot/i386/loader/help.i386 +++ b/sys/boot/i386/loader/help.i386 @@ -49,7 +49,7 @@ set boot_userconfig Requests that the kernel's interactive device configuration program - be run when the kernel is booted. + be run when the kernel is booted. Currently a no-op. ################################################################################ # Tset Sroot_disk_unit DForce the root disk unit number. diff --git a/sys/boot/pc98/loader/help.pc98 b/sys/boot/pc98/loader/help.pc98 index 4e4ec8bb2b27c..f055e2d5bf9e5 100644 --- a/sys/boot/pc98/loader/help.pc98 +++ b/sys/boot/pc98/loader/help.pc98 @@ -31,7 +31,7 @@ set boot_userconfig Requests that the kernel's interactive device configuration program - be run when the kernel is booted. + be run when the kernel is booted. Currently a no-op. ################################################################################ # Tset Sroot_disk_unit DForce the root disk unit number. |