Updates from NetBSD (cgd):

 - seriously clean up makefiles.  use libsa/libkern/libz as appropriate,
   and don't build the various sources into objs locally by specifying
   them directly in the Makefiles.
 - move the secondary bootstrap down (to 0x20004000), and add a HEAP_LIMIT
   so that we don't exhaust our bootstrap address space (when using the new,
   not yet checked in, memory allocator).
 - clean up installboot, deal with secondary bootstrap programs not on
   'a' partition or 'a' partition not starting at 0.
 - add padding to structures in bbinfo.h for future expansion.  Add a
   netbbinfo structure to allow netboot information to be hard-coded in
   network boot blocks, so that they can be made to work even on systems
   with firmware which doesn't support the new "ethernet address in boot
   device" convention.
 - move the sync() calls to the correct place in installboot.c
 - remove a kludge in disk.c which was breaking multiple opens/closes
   of the disk
 - allow netboot ethernet address to be hard-coded into binary so that
   machines with old firmware which doesn't pass it in the boot device
   can work.  Assume that if the ethernet address isn't passed in, it
   uses the old (dain-bramaged) 'read' interface works on my 3000/300LX.
 - Add setnetbootinfo, a program to hard code an ethernet address into
   a network boot.
 - move an 'int debug;' into boot.c (it was the only diff between boot.c and
   netboot.c), and nuke netboot.c (using boot.c instead for net boot blocks).
 - add cd9660 file system ops to the file system ops table in filesystem.c
 - if a file name is given (i.e. BOOTED_FILE) is set, boot only that file,
   but if not then try to boot "bsd", "bsd.bak", "bsd.old", and
   "obsd" (in that order) until one is found or until the list of names
   is exhausted.
 - add support for reading gzipped kernels.
 - use strerror() to print errors, rather than just printing error numbers
 - if no disk label exists, fake one up
 - slightly relax the block size checks in bootxx.c; they were a bit to paranoid

And local changes:
 - don't build a copy of libsa/libkern/libz for each boot prog,
   just build a single copy and use it for everything.

1 files changed, 30 insertions, 34 deletions

diff --git a/sys/arch/alpha/stand/installboot.8 b/sys/arch/alpha/stand/installboot.8
index 98e49fbd0b3..f0e52b98598 100644
--- a/sys/arch/alpha/stand/installboot.8
+++ b/sys/arch/alpha/stand/installboot.8
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: installboot.8,v 1.2 1997/04/07 05:23:33 millert Exp $
-.\"	$NetBSD: installboot.8,v 1.1 1996/11/06 23:07:55 cgd Exp $
+.\"	$OpenBSD: installboot.8,v 1.3 1997/05/05 06:01:47 millert Exp $
+.\"	$NetBSD: installboot.8,v 1.2 1997/04/06 08:41:11 cgd Exp $
 .\"
-.\" Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
+.\" Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
 .\"
@@ -30,22 +30,22 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd November 6, 1996
+.Dd January 16, 1997
 .Dt INSTALLBOOT 8
 .Os 
 .Sh NAME
 .Nm installboot
-.Nd install bootstrap software on an FFS partition
+.Nd install disk bootstrap software
 .Sh SYNOPSIS
 .Nm installboot
 .Op Fl nv
 .Ar boot
 .Ar bootxx
-.Ar device
+.Ar rawdiskdevice
 .Sh DESCRIPTION
 The
 .Nm installboot
-utility prepares an FFS partition for bootstrapping.
+utility prepares a disk for bootstrapping.
 .Pp
 The OpenBSD/alpha disk bootstrap software is split into two parts:
 a small first-stage boot program that is written into the disklabel
@@ -90,38 +90,38 @@ Verbose mode.
 .El
 .Pp
 The arguments are:
-.Bl -tag -width bootxx
+.Bl -tag -width rawdiskdevice
 .It Ar boot
 The name of the second-stage boot program in the file system
 where the first-stage boot program is to be installed.
 .It Ar bootxx
 The name of the prototype file for the first-stage boot program.
-.It Ar device
-The name of the raw device in which the first-stage boot program
-is to be installed.  
-This should be the raw device containing the file system
-which holds
-.Ar boot .
+.It Ar rawdiskdevice
+The name of the device corresponding to the raw whole-disk partition (the
+.Dq raw partition )
+of the disk on which the first-stage boot program is to be installed.
 .El
 .Sh EXAMPLES
-The following command will install the first-stage boot program in the
-root filesystem
-.Pq assumed to be mounted from Dq sd0a
-using the file
-.Pa /boot
-as the second-stage boot program:
+.Pa boot
+resides in the FFS file system mounted on
+.Pa /
+from
+.Dq sd0a ,
+you would install the first-stage boot program on the disk
+(and therefore make the disk bootable) by using the command:
 .Bd -literal -offset indent
-installboot /boot /usr/mdec/bootxx /dev/rsd0a
+installboot /boot /usr/mdec/bootxx /dev/rsd0c
 .Ed
 .Sh BUGS
-OpenBSD/alpha systems are only capable of booting off of disks'
+The OpenBSD/alpha boot blocks can only load kernels from disks'
 .Dq a
-partitions, and bootable partitions must start at the beginning
-of the disk.
+partitions.  (However, the second-stage boot
+program may be located on any FFS file system partition
+on the disk.)
 .Pp
 .Nm Installboot
 requires simultaneous access to the mounted file system and
-the raw device.
+the disks' raw partition.
 That is not allowed with the kernel
 .Dv securelevel
 variable
@@ -129,15 +129,11 @@ variable
 see
 .Xr sysctl 8
 .Pc
-set to a value greater than zero, so
-.Nm installboot
-only works when the system is in
-an insecure mode (e.g. single-user mode; see
-.Xr init 8 ).
-Alternately, one can use the ``c'' partition of
-the target device which avoids this problem since
-the ``c'' partition spans the entire disk and
-should not be mounted.
+set to a value greater than one, or with
+.Dv securelevel
+set to one if the
+.Dq boot
+program resides in a file system on the disk's raw partition.
 .Sh "SEE ALSO"
 .Xr disklabel 8 ,
 .Xr init 8 ,