From 9b38070e4ba2ff1501eb6c281d6ca0fd06a594d5 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 5 Sep 2010 22:23:59 +0200 Subject: [PATCH] Remove loader.4th.8 and references to it. --- Makefile_upgrade.inc | 2 + share/man/man5/loader.conf.5 | 3 +- sys/boot/common/loader.8 | 6 - sys/boot/forth/loader.4th.8 | 223 ----------------------------------- 4 files changed, 3 insertions(+), 231 deletions(-) delete mode 100644 sys/boot/forth/loader.4th.8 diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 73ecba52ce..d8a4db5ca7 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1518,6 +1518,8 @@ TO_REMOVE+=/usr/share/man/man9/spin_unlock_rd.9.gz TO_REMOVE+=/usr/share/man/man9/spin_unlock_rd_quick.9.gz TO_REMOVE+=/usr/share/man/man9/spin_unlock_wr.9.gz TO_REMOVE+=/usr/share/man/man9/spin_unlock_wr_quick.9.gz +TO_REMOVE+=/usr/share/man/cat8/loader.4th.8.gz +TO_REMOVE+=/usr/share/man/man8/loader.4th.8.gz # XXX Remove when adjusted to the new 802.11 framework TO_REMOVE+=/boot/modules/if_acx.ko diff --git a/share/man/man5/loader.conf.5 b/share/man/man5/loader.conf.5 index c7337f3e7e..dd99b1ac7e 100644 --- a/share/man/man5/loader.conf.5 +++ b/share/man/man5/loader.conf.5 @@ -242,8 +242,7 @@ contains the instructions to automatically process .El .Sh SEE ALSO .Xr boot 8 , -.Xr loader 8 , -.Xr loader.4th 8 +.Xr loader 8 .Sh HISTORY The file .Nm diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 9d68e8f13b..8027af2817 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -185,11 +185,6 @@ must precede the kernel name, if a kernel name is provided. Flags are described in .Xr boot 8 . .Pp -.Em WARNING : -The behavior of this builtin is changed if -.Xr loader.4th 8 -is loaded. -.Pp .It Ic echo Xo .Op Fl n .Op Aq message @@ -901,7 +896,6 @@ Unspecified error. .Xr tuning 7 , .Xr boot 8 , .Xr btxld 8 , -.Xr loader.4th 8 , .Xr sysctl 8 .Sh STANDARDS For the purposes of ANS Forth compliance, loader is an diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8 deleted file mode 100644 index b700dd6ca8..0000000000 --- a/sys/boot/forth/loader.4th.8 +++ /dev/null @@ -1,223 +0,0 @@ -.\" Copyright (c) 1999 Daniel C. Sobral -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.14 2002/08/13 15:09:33 ru Exp $ -.\" $DragonFly: src/sys/boot/forth/loader.4th.8,v 1.6 2008/09/06 12:14:08 thomas Exp $ -.\" -.Dd September 6, 2008 -.Dt LOADER.4TH 8 -.Os -.Sh NAME -.Nm loader.4th -.Nd loader.conf processing tools -.Sh DESCRIPTION -The file that goes by the name of -.Nm -is a set of commands designed to manipulate -.Xr loader.conf 5 -files. -The default -.Pa loader.rc -includes -.Nm -and uses one of its commands to automatically read and process -the standard -.Xr loader.conf 5 -files. -Other commands exists to help the user specify alternate -configurations. -.Pp -The commands of -.Nm -by themselves are not enough for most uses. -Please refer to the -examples below for the most common situations, and to -.Xr loader 8 -for additional commands. -.Pp -Before using any of the commands provided in -.Nm , -it must be included -through the command: -.Pp -.Dl include loader.4th -.Pp -This line is present in the default -.Pa loader.rc -file, so it isn't needed (and should not be re-issued) in a normal setup. -.Pp -The commands provided by it are: -.Bl -tag -width disable-module_module -compact -offset indent -.It Ic boot -.It Ic boot Ar kernelname Op Cm ... -.It Ic boot Ar directory Op Cm ... -.It Ic boot Fl flag Cm ... -Boot as specified by the -.Xr loader.conf 5 -files read. -.Pp -Depending on the arguments passed, it can override boot flags and -either the kernel name or the search path for kernel and modules. -.Pp -.It Ic boot-conf -.It Ic boot-conf Ar kernelname Op Cm ... -.It Ic boot-conf Ar directory Op Cm ... -.It Ic boot-conf Fl flag Cm ... -Works like -.Ic boot -described above, but instead of booting immediately, uses -.Ic autoboot , -so it can be stopped. -.Pp -.It Ic start -Reads -.Pa defaults/loader.conf , -all other -.Xr loader.conf 5 -files specified in it, and then proceeds to boot as specified in them. -This -is the command used in the default -.Pa loader.rc -file, and it uses the -.Pa autoboot -command (see -.Xr loader 8 ) , -so it can be stopped for further interaction with -.Xr loader 8 . -.Pp -.It Ic initialize -Initialize the supporting library so commands can be used without -executing -.Ic start -first. -Like -.Ic start , -reads -.Pa defaults/loader.conf -and all other -.Xr loader.conf 5 -files specified in it. -Returns a flag on the stack to indicate -if any configuration file was successfully loaded. -.Pp -.It Ic read-conf Ar filename -Reads and processes a -.Xr loader.conf 5 -file. -Does not proceed to boot. -.Pp -.It Ic enable-module Ar module -Enables the loading of -.Ar module . -.Pp -.It Ic disable-module Ar module -Disables the loading of -.Ar module . -.Pp -.It Ic toggle-module Ar module -Toggles the loading of -.Ar module -on and off. -.Pp -.It Ic show-module Ar module -Shows the information gathered in the -.Xr loader.conf 5 -files about the module -.Ar module . -.Pp -.It Ic retry -Used inside -.Xr loader.conf 5 -files to specify the action after a module loading fails. -.Pp -.It Ic ignore -Used inside -.Xr loader.conf 5 -files to specify the action after a module loading fails. -.El -.Sh FILES -.Bl -tag -width /boot/loader.4th -compact -.It Pa /boot/loader -The -.Xr loader 8 . -.It Pa /boot/loader.4th -.Nm -itself. -.It Pa /boot/loader.rc -.Xr loader 8 -bootstrapping script. -.It Pa /boot/defaults/loader.conf -File loaded by the -.Ic start -command. -.El -.Sh EXAMPLES -Standard -.Pa loader.rc : -.Pp -.Bd -literal -offset indent -compact -include loader.4th -start -.Ed -.Pp -Load a different kernel with the standard configuration: -.Pp -.Bd -literal -offset indent -compact -set kernel="kernel.old" -unload -boot-conf -.Ed -.Pp -Read an additional configuration file and then proceed to boot: -.Pp -.Bd -literal -offset indent -compact -unload -read-conf special.conf -boot-conf -.Ed -.Pp -Disable the loading of the splash screen module and bitmap and then -proceed to boot: -.Pp -.Bd -literal -offset indent -compact -unload -disable-module splash_bmp -disable-module bitmap -boot-conf -.Ed -.Sh SEE ALSO -.Xr loader.conf 5 , -.Xr loader 8 -.Sh HISTORY -The -.Nm -set of commands first appeared in -.Fx 3.2 . -.Sh AUTHORS -The -.Nm -set of commands was written by -.An Daniel C. Sobral Aq dcs@FreeBSD.org . -.Sh BUGS -A British espionage series. -- 2.41.0