Document softraid boot process for i386/amd64.

Requested by Adam Thompson.
suggestions and ok deraadt, earlier version ok jmc

4 files changed, 44 insertions, 8 deletions

diff --git a/sys/arch/amd64/stand/biosboot/biosboot.8 b/sys/arch/amd64/stand/biosboot/biosboot.8
index 3999209af08..ec1bd95393f 100644
--- a/sys/arch/amd64/stand/biosboot/biosboot.8
+++ b/sys/arch/amd64/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: biosboot.8,v 1.10 2011/12/03 23:01:21 schwarze Exp $
+.\"	$OpenBSD: biosboot.8,v 1.11 2013/10/28 15:15:08 stsp Exp $
 .\"
 .\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
 .\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 3 2011 $
+.Dd $Mdocdate: October 28 2013 $
 .Dt BIOSBOOT 8 amd64
 .Os
 .Sh NAME
@@ -54,6 +54,17 @@ inode,
 the offset within this block of the inode,
 and various filesystem parameters (taken from the superblock)
 required to convert filesystem blocks to disk sectors.
+Usually,
+.Xr boot 8
+is loaded from the root filesystem of the boot disk.
+If the boot disk is a
+.Xr softraid 4
+volume,
+.Xr installboot 8
+arranges for a copy of
+.Xr boot 8
+to be loaded from a dedicated single-inode filesystem located within
+the volume's meta data area.
 .Pp
 You must re-run
 .Xr installboot 8
@@ -252,6 +263,7 @@ kernel for multiprocessor machines
 kernel for installation/recovery
 .El
 .Sh SEE ALSO
+.Xr softraid 4 ,
 .Xr boot 8 ,
 .Xr boot_amd64 8 ,
 .Xr disklabel 8 ,
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index fff28ac9188..c6fccb082cf 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.20 2013/10/25 13:08:03 jmc Exp $
+.\"	$OpenBSD: boot.8,v 1.21 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 amd64
 .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_amd64 8 ,
 .Xr boot_config 8 ,
diff --git a/sys/arch/i386/stand/biosboot/biosboot.8 b/sys/arch/i386/stand/biosboot/biosboot.8
index 679b79bc35f..b154093d068 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.8
+++ b/sys/arch/i386/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: biosboot.8,v 1.24 2011/12/03 23:01:21 schwarze Exp $
+.\"	$OpenBSD: biosboot.8,v 1.25 2013/10/28 15:15:08 stsp Exp $
 .\"
 .\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
 .\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 3 2011 $
+.Dd $Mdocdate: October 28 2013 $
 .Dt BIOSBOOT 8 i386
 .Os
 .Sh NAME
@@ -54,6 +54,17 @@ inode,
 the offset within this block of the inode,
 and various filesystem parameters (taken from the superblock)
 required to convert filesystem blocks to disk sectors.
+Usually,
+.Xr boot 8
+is loaded from the root filesystem of the boot disk.
+If the boot disk is a
+.Xr softraid 4
+volume,
+.Xr installboot 8
+arranges for a copy of
+.Xr boot 8
+to be loaded from a dedicated single-inode filesystem located within
+the volume's meta data area.
 .Pp
 You must re-run
 .Xr installboot 8
@@ -252,6 +263,7 @@ kernel for multiprocessor machines
 kernel for installation/recovery
 .El
 .Sh SEE ALSO
+.Xr softraid 4 ,
 .Xr boot 8 ,
 .Xr boot_i386 8 ,
 .Xr disklabel 8 ,
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 ,