summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2003-10-04 16:47:41 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2003-10-04 16:47:41 +0000
commitfa07141025f58e6fdc04f9324269e3becec3d6d2 (patch)
treefc6bf06a24aba5fa8d4d31a791465b55e84bd22f /sys/arch/i386
parent09ba5264ad9970bc5673c1e99472bcb38808508e (diff)
- document that boot will by default try to load /bsd, /obsd then /bsd.old.
- indent examples, and put descriptions before rather than after them. ok mickey@
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/stand/boot/boot.832
1 files changed, 22 insertions, 10 deletions
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index fb75a72a903..0448cf22f53 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot.8,v 1.34 2003/10/04 10:33:04 jmc Exp $
+.\" $OpenBSD: boot.8,v 1.35 2003/10/04 16:47:40 jmc Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
@@ -125,6 +125,18 @@ If you do not,
will proceed to load the kernel with the current parameters after the
timeout period has expired.
.El
+.Pp
+By default,
+.Nm
+attempts to load the kernel executable
+.Pa /bsd .
+If that fails, it will attempt to load
+.Pa /obsd
+and then
+.Pa /bsd.old .
+If it fails to find any of these files,
+and no alternative kernel image has been specified,
+the system will be unable to boot.
.Sh COMMANDS
The following commands are accepted at the
.Nm
@@ -288,27 +300,25 @@ system bootstrap's startup file
kernel image
.El
.Sh EXAMPLES
-.Li boot> boot
+Boot the default kernel:
.Pp
-Boot the default kernel.
-.Pp
-.Li # echo \&"boot\&" > /etc/boot.conf
+.Dl boot> boot
.Pp
Remove the 5 second pause at boot-time permanently, causing
.Nm
-to load the kernel immediately without prompting.
+to load the kernel immediately without prompting:
.Pp
-.Li boot> set tty com0
+.Dl # echo \&"boot\&" > /etc/boot.conf
.Pp
Use serial console.
A null modem cable should connect the specified serial port to a terminal.
Useful for debugging.
.Pp
-.Li # echo \&"set tty com0\&" > /etc/boot.conf
+.Dl boot> set tty com0
.Pp
-Invoke the serial console at every boot.
+Invoke the serial console at every boot:
.Pp
-.Li boot> boot wd1a:/bsd -c
+.Dl # echo \&"set tty com0\&" > /etc/boot.conf
.Pp
Boot the kernel named
.Pa /bsd
@@ -323,6 +333,8 @@ Once booted, such changes can be made permanent by using
.Xr config 8 Ns 's
.Fl e
option.
+.Pp
+.Dl boot> boot wd1a:/bsd -c
.Sh SEE ALSO
.Xr gzip 1 ,
.Xr autoconf 4 ,