summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/boot
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2013-10-28 15:15:09 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2013-10-28 15:15:09 +0000
commit89790732dc54decce0a8a0a7b589cd165c8f9d04 (patch)
tree7704171410947eb3aa9eca65ef63b0e00b99a03d /sys/arch/i386/stand/boot
parent1c7e9cb2b955c182b64113bb3393dea2ebd94212 (diff)
Document softraid boot process for i386/amd64.
Requested by Adam Thompson. suggestions and ok deraadt, earlier version ok jmc
Diffstat (limited to 'sys/arch/i386/stand/boot')
-rw-r--r--sys/arch/i386/stand/boot/boot.810
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index 636d3fb9522..9cffef88dee 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.57 2013/10/25 13:08:03 jmc Exp $
+.\" $OpenBSD: boot.8,v 1.58 2013/10/28 15:15:08 stsp Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: October 25 2013 $
+.Dd $Mdocdate: October 28 2013 $
.Dt BOOT 8 i386
.Os
.Sh NAME
@@ -138,6 +138,11 @@ attempts to load the kernel executable
.Pa /bsd .
If it fails to find the kernel and no alternative kernel image has
been specified, the system will be unable to boot.
+.Pp
+.Nm
+supports booting from
+.Xr softraid 4
+RAID 1 and CRYPTO volumes.
.Sh COMMANDS
The following commands are accepted at the
.Nm
@@ -380,6 +385,7 @@ option.
.Xr gzip 1 ,
.Xr autoconf 4 ,
.Xr ddb 4 ,
+.Xr softraid 4 ,
.Xr biosboot 8 ,
.Xr boot_config 8 ,
.Xr boot_i386 8 ,