From 0240d032a40f3782406ed07fac190b1a106c74b7 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 12 Nov 2006 18:15:11 +0000 Subject: [PATCH] Rename boot_i386.8 to boot_pc32.8 by repo-copy in order to enable the creation of the boot.8 MLINK again. Remove boot_i386.8 with 'make upgrade'. --- etc/Makefile | 3 +- sbin/reboot/Makefile | 4 +- sbin/reboot/boot_i386.8 | 318 ---------------------------------------- sbin/reboot/boot_pc32.8 | 2 +- 4 files changed, 5 insertions(+), 322 deletions(-) delete mode 100644 sbin/reboot/boot_i386.8 diff --git a/etc/Makefile b/etc/Makefile index 1dce79ddca..9bfde5f7a9 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.142 2006/11/11 20:18:37 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.143 2006/11/12 18:15:11 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -456,6 +456,7 @@ upgrade_etc: preupgrade csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}5/ftpd.conf.5.gz" csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}5/ftpusers.5.gz" rm -f ${DESTDIR}/usr/include/machine/dvcfg.h + csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}8/boot_i386.8.gz" ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NO_MAKEDEV) diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile index 0caa464585..00d3257a5e 100644 --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD: src/sbin/reboot/Makefile,v 1.6.8.3 2002/02/20 15:26:14 ru Exp $ -# $DragonFly: src/sbin/reboot/Makefile,v 1.4 2006/10/17 00:55:43 pavalos Exp $ +# $DragonFly: src/sbin/reboot/Makefile,v 1.5 2006/11/12 18:15:11 swildner Exp $ PROG= reboot DPADD= ${LIBUTIL} LDADD= -lutil -MAN= reboot.8 boot_i386.8 +MAN= reboot.8 boot_pc32.8 MLINKS= reboot.8 halt.8 reboot.8 fastboot.8 reboot.8 fasthalt.8 .if exists(${.CURDIR}/boot_${MACHINE}.8) diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 deleted file mode 100644 index c00ebb5bc6..0000000000 --- a/sbin/reboot/boot_i386.8 +++ /dev/null @@ -1,318 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" This code is derived from software written and contributed -.\" to Berkeley by William Jolitz. -.\" -.\" Almost completely rewritten for FreeBSD 2.1 by Joerg Wunsch. -.\" -.\" Substantially revised for FreeBSD 3.1 by Robert Nordier. -.\" -.\" 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. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. -.\" -.\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 -.\" -.\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.11 2002/04/24 17:47:58 rnordier Exp $ -.\" $DragonFly: src/sbin/reboot/Attic/boot_i386.8,v 1.6 2006/02/28 02:25:10 swildner Exp $ -.\" -.Dd April 19, 1994 -.Dt BOOT 8 i386 -.Os -.Sh NAME -.Nm boot -.Nd system bootstrapping procedures -.Sh DESCRIPTION -.Sy Power fail and crash recovery . -Normally, the system will reboot itself at power-up or after crashes. -An automatic consistency check of the file systems will be performed, -and unless this fails, the system will resume multi-user operations. -.Pp -.Sy Cold starts . -Most i386 PCs attempt to boot first from floppy disk drive 0 (sometimes -known as drive A:) and, failing that, from hard disk drive 0 (sometimes -known as drive C:, or as drive 0x80 to the BIOS). Some BIOSes allow -you to change this default sequence, and may also include a CD-ROM -drive as a boot device. -.Pp -By default, a three-stage bootstrap is employed, and control is -automatically passed from the boot blocks (bootstrap stages one and -two) to a separate third-stage bootstrap program, -.Xr loader 8 . -This third stage provides more sophisticated control over the booting -process than it is possible to achieve in the boot blocks, which are -constrained by occupying limited fixed space on a given disk or slice. -.Pp -However, it is possible to dispense with the third stage altogether, -either by specifying a kernel name in the boot block parameter -file, -.Pa /boot.config , -or, unless option -.Fl n -is set, by hitting a key during a brief pause (while one of the characters -.Sy - , -.Sy \e , -.Sy \&| , -or -.Sy / -is displayed) before -.Xr loader 8 -is invoked. Booting will also be attempted at stage two, if the -third stage cannot be loaded. -.Pp -The remainder of this subsection deals only with the boot blocks. The -.Xr loader 8 -program is documented separately. -.Pp -After the boot blocks have been loaded, -you should see a prompt similar to the following: -.Bd -literal ->> BSD/i386 BOOT -Default: 0:ad(0,a)/kernel -boot: -.Ed -.Pp -The automatic boot will attempt to load -.Pa /kernel -from partition -.Ql a -of either the floppy or the hard disk. -This boot may be aborted by typing any character on the keyboard -at the -.Ql boot: -prompt. At this time, the following input will be accepted: -.Bl -tag -width indent -.It Ic \&? -Give a short listing of the files in the root directory of the default -boot device, as a hint about available boot files. (A -.Ic ?\& -may also be specified as the last segment of a path, in which case -the listing will be of the relevant subdirectory.) -.Pp -.It Xo -.Ar bios_drive : Ns Ar interface Ns Po -.Ar unit , Ns Ar part Pc -.Ar filename -.Op Fl aCcDdghmnPprsvV -.Xc -Specify boot file and flags. -.Bl -tag -width indent -.It Ar bios_drive -The drive number as recognized by the BIOS. -0 for the first drive, 1 for the second drive, etc. -.It Ar interface -The type of controller to boot from. Note that the controller is required -to have BIOS support since the BIOS services are used to load the -boot file image. -.Pp -The supported interfaces are: -.Pp -.Bl -tag -width "adXX" -compact -.It ad -ST506, IDE, ESDI, RLL disks on a WD100[2367] or lookalike -controller -.It fd -5 \(14" or 3 \(12" High density floppies -.It da -SCSI disk on any supported SCSI controller -.\".It cd -.\"boot from CDROM -.El -.It Ar unit -The unit number of the drive on the interface being used. -0 for the first drive, 1 for the second drive, etc. -.It Ar part -The partition letter inside the -.Bx -portion of the disk. See -.Xr disklabel 8 . -By convention, only partition -.Ql a -contains a bootable image. If sliced disks are used -.Pq Dq fdisk partitions , -any slice can be booted from, with the default being the active slice -or, otherwise, the first -.Dx -slice. -.It Ar filename -The pathname of the file to boot (relative to the root directory -on the specified partition). Defaults to -.Pa /kernel . -Symbolic links are not supported (hard links are). -.It Fl acCdDghnPrsv -Boot flags: -.Pp -.Bl -tag -width "-CXX" -compact -.It Fl a -during kernel initialization, -ask for the device to mount as the root file system. -.It Fl C -boot from CDROM. -.It Fl c -run UserConfig to modify hardware parameters for the loaded -kernel. If the kernel was built with one of -.Dv USERCONFIG , INTRO_USERCONFIG , VISUAL_USERCONFIG -options, -remain in UserConfig regardless of any -.Ic quit -commands present in the script. -.It Fl D -Use all available consoles as the system console. Input will be accepted -on any console and output will be routed to all of them. This is the -default. -.It Fl h -Use the serial console as the system console. -.It Fl V -Use the video console as the system console. -.It Fl m -Mute the system console. None of the console devices will be used for the -system console. -.It Fl d -enter the DDB kernel debugger -(see -.Xr ddb 4 ) -as early as possible in kernel initialization. -.It Fl g -use the GDB remote debugging protocol. -.It Fl n -ignore key press to interrupt boot before loader(8) is invoked. -.It Fl P -probe the keyboard. If no keyboard is found, the -.Fl D -and -.Fl h -options are automatically set. -.It Fl p -pause after each attached device during the device probing phase. -.It Fl r -use the statically configured default for the device containing the -root file system -(see -.Xr config 8 ) . -Normally, the root file system is on the device -that the kernel was loaded from. -.It Fl s -boot into single-user mode; if the console is marked as -.Dq insecure -(see -.Xr ttys 5 ) , -the root password must be entered. -.It Fl v -be verbose during device probing (and later). -.El -.El -.El -.Pp -You may put a BIOS drive number, a controller type, a unit number, -a partition, a kernel file name, and any valid option in -.Pa /boot.config -to set defaults. Enter them in one line just as you type at the -.Ql boot: -prompt. -.Sh FILES -.Bl -tag -width /boot/loader -compact -.It Pa /boot.config -parameters for the boot blocks (optional) -.It Pa /boot/boot1 -first stage bootstrap file -.It Pa /boot/boot2 -second stage bootstrap file -.It Pa /boot/loader -third stage bootstrap -.It Pa /kernel -default kernel -.It Pa /kernel.old -typical non-default kernel (optional) -.El -.Sh DIAGNOSTICS -When disk-related errors occur, these are reported by the second-stage -bootstrap using the same error codes returned by the BIOS, for example -.Dq Disk error 0x1 (lba=0x12345678) . -Here is a partial list of these error codes: -.Pp -.Bl -tag -width "0x80" -compact -.It 0x1 -Invalid argument -.It 0x2 -Address mark not found -.It 0x4 -Sector not found -.It 0x8 -DMA overrun -.It 0x9 -DMA attempt across 64K boundary -.It 0xc -Invalid media -.It 0x10 -Uncorrectable CRC/ECC error -.It 0x20 -Controller failure -.It 0x40 -Seek failed -.It 0x80 -Timeout -.El -.Pp -.Sy "NOTE" : -On older machines, or otherwise where EDD support (disk packet -interface support) is not available, all boot-related files and -structures (including the kernel) that need to be accessed during the -boot phase must reside on the disk at or below cylinder 1023 (as the -BIOS understands the geometry). When a -.Dq Disk error 0x1 -is reported by the second-stage bootstrap, it generally means that this -requirement has not been adhered to. -.Sh SEE ALSO -.Xr ddb 4 , -.Xr ttys 5 , -.Xr boot0cfg 8 , -.Xr btxld 8 , -.Xr config 8 , -.Xr disklabel 8 , -.Xr halt 8 , -.Xr loader 8 , -.Xr reboot 8 , -.Xr shutdown 8 -.Sh BUGS -The -.Xr disklabel 5 -format used by this version of -.Bx -is quite -different from that of other architectures. -.Pp -Due to space constraints, the keyboard probe initiated by the -.Fl P -option is simply a test that the BIOS has detected an -.Dq extended -keyboard. If an -.Dq XT/AT -keyboard (with no F11 and F12 keys, etc.) is attached, the probe will -fail. -.Pp -Some features are not yet documented. diff --git a/sbin/reboot/boot_pc32.8 b/sbin/reboot/boot_pc32.8 index 0098c9eb1a..95e924ec6f 100644 --- a/sbin/reboot/boot_pc32.8 +++ b/sbin/reboot/boot_pc32.8 @@ -39,7 +39,7 @@ .\" @(#)boot_i386.8 8.2 (Berkeley) 4/19/94 .\" .\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.11 2002/04/24 17:47:58 rnordier Exp $ -.\" $DragonFly: src/sbin/reboot/boot_pc32.8,v 1.6 2006/02/28 02:25:10 swildner Exp $ +.\" $DragonFly: src/sbin/reboot/boot_pc32.8,v 1.7 2006/11/12 18:15:11 swildner Exp $ .\" .Dd April 19, 1994 .Dt BOOT 8 i386 -- 2.41.0