summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-08-24 15:38:00 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-08-24 15:38:00 +0000
commit2811df47204646706fb17b299302a29b75cc5108 (patch)
treeba9959714ebb6e8b9ae2a73a1a66c37991176267 /sys/arch
parent70980682f13ac2b8dcd3370b6c43a3e76bd66bf7 (diff)
Correctly document the order in which cdboot looks for kernels.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/stand/cdboot/cdboot.810
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/cdboot/cdboot.8 b/sys/arch/amd64/stand/cdboot/cdboot.8
index 8109ebdbebb..3298661f611 100644
--- a/sys/arch/amd64/stand/cdboot/cdboot.8
+++ b/sys/arch/amd64/stand/cdboot/cdboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdboot.8,v 1.1 2004/08/21 18:53:38 tom Exp $
+.\" $OpenBSD: cdboot.8,v 1.2 2004/08/24 15:37:59 tom Exp $
.\" Copyright (c) 2004 Tom Cosgrove
.\" Copyright (c) 2003 Matthias Drochner
.\" Copyright (c) 1999 Doug White
@@ -57,9 +57,11 @@ If no commands are given for a short time,
.Nm
will then attempt to load an
.Ox
-kernel
-.Pa /bsd
-from the CD.
+kernel from the CD.
+It first looks for
+.Pa /3.6/amd64/bsd.rd ,
+then for
+.Pa /bsd .
It may be told to boot an alternative kernel,
either by commands in the
.Pa boot.conf