update slightly

5 files changed, 110 insertions, 56 deletions

diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index e04df5579d9..ada640da7fa 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -1,4 +1,4 @@
-The sparc-specific portion of the OpenBSD RELEASE release is found in the
+The sparc-specific portion of the OpenBSD 2.0 release is found in the
 "sparc" subdirectory of the distribution.  That subdirectory is laid
 out as follows:
 
@@ -10,12 +10,12 @@ out as follows:
 				and installation script.
 
 The OpenBSD/sparc binary distribution sets contain the binaries which
-comprise the OpenBSD RELEASE release for the sparc.  There are seven binary
+comprise the OpenBSD 2.0 release for the sparc.  There are seven binary
 distribution sets, and the "security" distribution set.  The binary
 distribution sets can be found in subdirectories of the "sparc/bins"
-subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
+subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
 
-	base20	The OpenBSD/sparc RELEASE base binary distribution.  You
+	base20	The OpenBSD/sparc 2.0 base binary distribution.  You
 		MUST install this distribution set.  It contains the
 		base OpenBSD utilities that are necessary for the
 		system to run and be minimally functional.  It
diff --git a/distrib/notes/sparc/hardware b/distrib/notes/sparc/hardware
index 1422216ab0e..fead464a3b7 100644
--- a/distrib/notes/sparc/hardware
+++ b/distrib/notes/sparc/hardware
@@ -1,16 +1,14 @@
-OpenBSD/sparc RELEASE runs on the following classes of machines:
+OpenBSD/sparc 2.0 runs on the following classes of machines:
 	- sun4c (e.g. the SS1, SS1+, SS2, IPC, ELC, IPX, and SLC)
 	- sun4 (e.g. the 4/100, 4/200, and 4/300.   note that support
 		for the 4/400 processor is incomplete)
+	- sun4m (e.g. sparc classic, 4, 5, 10, and 20)
 
-OpenBSD/sparc RELEASE does *not* run on these machines (yet):
+OpenBSD/sparc 2.0 does *not* run on these machines (yet):
 	- sun-4/400 (lacking support for the I/O cache, and has
 			ethernet problems)
-	- sun4m (e.g. sparc classic, 4, 5, 10, and 20)
 	- sun4d (e.g. sparc center 2000)
-
-Work on porting OpenBSD/sparc to the sun4m platform is currently in 
-progress, but was not ready in time for the 2.0 release.
+	- sun4u (e.g. Ultrasparcs)
 
 The minimal configuration requires 4M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to run
@@ -47,7 +45,9 @@ Supported devices include:
 
 Hardware the we do NOT currently support, but get many questions
 about:
-	sun4m, including multiprocessor machines
+	multiprocessor machines
+	audio drivers for sun4m machines
+	floppy driver for sun4m machines
 	interrupt driven SCSI driver for sun-4/100's and sun-4/200's
 
 The next release will hopefully run on many more machines.  In
diff --git a/distrib/notes/sparc/install b/distrib/notes/sparc/install
index ca3f2496b1d..e7abe4a4482 100644
--- a/distrib/notes/sparc/install
+++ b/distrib/notes/sparc/install
@@ -1,12 +1,58 @@
 Installing OpenBSD is a relatively complex process, but if you have
 this document in hand it shouldn't be too much trouble.
 
-There are several ways to install OpenBSD onto a disk. If your Sparcstation
-is hooked up in a network you can find find a server and arrange for a
-diskless setup which is a convenient way to install on a machine with
-a single disk attached. Alternatively, you could use SunOS (booted from
-a local disk) and install OpenBSD onto a second disk. For the latter method,
-skip to the section "Installing from SunOS" below.
+There are several ways to install OpenBSD onto a disk. The easiest way
+nin terms of preliminary setup is to use the OpenBSD miniroot that can
+be booted off your local disk's swap partition. Alternatively, if your
+Sparcstation is hooked up in a network you can find a server and arrange
+for a diskless setup which is a convenient way to install on a machine
+whose disk does not currently hold a usable operating system (see the
+section `Installing using a diskless setup' below).
+
+
+Installing using the OpenBSD miniroot.
+
+The miniroot is a self-contained OpenBSD filesystem holding all utilities
+necessary to install OpenBSD on a local disk. It is distributed as a plain
+file designed to be transferred to a raw disk partition from which it can
+be booted using the appropriate PROM command. Usually, the miniroot will
+be loaded into the swap partition of a disk. If needed, you can use any
+other unused partition, but remember that the partition will then not
+available during the installation process.
+
+Loading the miniroot onto your raw partition is simple. On OpenBSD as well
+as SunOS you use a command like:
+
+	# dd if=miniroot20.fs of=/dev/rsd0b bs=20b conv=sync
+
+(here `/dev/rsd0b' is assumed to be your swap partition). There's a
+potential problem here if /dev/rsd0b is actually in use as a swap
+partition by your currently running system. If you don't have another
+disk or partition to spare, you can usually get away with running this
+command anyway after first booting into single-user mode to ensure a
+quiet system.
+
+After transferring the miniroot to disk, bring the system down by:
+
+	# halt
+
+Then boot the miniroot by typing the appropriate command at the PROM:
+
+	> b sd(,,1)bsd -s			# for sun4 monitors
+	ok boot sd(,,1)bsd -s		# for version 1 OpenBOOT ROMs
+	ok boot disk:b bsd -s		# for version 2 OpenBOOT ROMs
+
+If you've loaded the miniroot onto some other disk than `sd0' adapt
+the boot specifier accordingly, e.g.:
+
+	ok boot disk1:b bsd -s
+
+to boot from SCSI disk target 1 from a version 2 OpenBOOT ROM.
+
+This will cause the kernel contained in the miniroot to be booted.
+After the initial probe messages you'll asked to start the install
+or upgrade procedure. Proceed to the section `Running the installation
+scripts' below.
 
 
 Installing using a diskless setup.
@@ -19,12 +65,12 @@ documentation that came with it (on SunOS systems, add_client(8) is a
 good start).
 
 Your Sparcstation expects to be able to download a second stage bootstrap
-program via TFTP after havinf acquired its IP address through RevARP when
+program via TFTP after having acquired its IP address through RevARP when
 instructed to boot "over the net". It will look for a filename composed of
 the machine's IP address followed by the machine's architecture, separated
 by a period. For example, a sun4c machine which has been assigned IP
 address 130.115.144.11, will make an TFTP request for `8273900B.SUN4C'.
-Normally, this file is symbolic link to an appropriate second-stage
+Normally, this file is a symbolic link to an appropriate second-stage
 boot program, which should be located in a place where the TFTP daemon
 can find it (remember, many TFTP daemons run in a chroot'ed environment).
 You can find the boot program in `/usr/mdec/boot' in the OpenBSD/sparc
@@ -42,14 +88,29 @@ Here's an example to illustrate this whole mess:
     else
 	server# set SKIP=0
 	server# set KARCH=SUN4C
-    server# dd if=boot of=/tftpboot/boot.sparc.bsd.$KARCH skip=$SKIP bs=32
+    server# dd if=boot of=/tftpboot/boot.sparc.OpenBSD.$KARCH skip=$SKIP bs=32
     server# cd /tftpboot
-    server# ln -s boot.sparc.bsd.$KARCH 8273900B.$KARCH
+    server# ln -s boot.sparc.OpenBSD.$KARCH 8273900B.$KARCH
 
-Note: some versions of Openboot ROMs (sun4c) seem to require that the
+Note: some versions of Openboot ROMs (sun4c/sun4m) seem to require that the
 boot program size is nicely rounded. Therefore it may be necessary to
 strip(8) off the symbol table.
 
+After the boot program has been loaded into memory and given control by
+the PROM, it starts locating the machine's remote root directory through
+the BOOTPARAM protocol. First a BOOTPARAM WHOAMI request is broadcast
+on the local net. The answer to this request (if it comes in) contains
+the client's name. This name is used in next step, a BOOTPARAM GETFILE
+request -- sent to the server that responded to the WHOAMI request --
+requesting the name and address of the machine that will serve the client's
+root directory, as well as the path of the client's root on that server.
+
+Finally, this information (if it comes in) is used to issue a REMOTE MOUNT
+request to the client's root filesystem server, asking for an NFS file
+handle corresponding to the root filesystem. If successful, the boot
+rogram starts reading from the remote root filesystem in search of the
+kernel which is then read into memory.
+
 
 As noted above in the section `Preparing your System for OpenBSD Installation',
 you have several options when choosing a location to store the installation
@@ -77,7 +138,7 @@ A few configuration files need to be edited:
 		Enter the entries for the remotely mounted filesystems.
 		For example:
 			server:/export/root/client       /     nfs  rw 0 0
-			server:/export/exec/sun4.bsd     /usr  nfs  rw 0 0
+			server:/export/exec/sun4.OpenBSD /usr  nfs  rw 0 0
 
 Now you must populate the the `/dev' directory for your client. If you server
 runs SunOS 4.x, you can simply change your working directory to `<root>/dev'
@@ -112,27 +173,25 @@ instead of `ok', type:
 If you use a diskless setup with a separately NFS-mounted /usr filesystem,
 mount /usr by hand now:
 
-openbsd# mount /usr
+OpenBSD# mount /usr
 
 At this point, it's worth checking the disk label and partition sizes on
 the disk you want to install OpenBSD onto. OpenBSD understands SunOS-style
 disklabels, so if your disk was previously used by SunOS there will be
 a usable label on it. Use `disklabel -e <disk>' (where <disk> is the
 device name assigned by the OpenBSD kernel, e.g. `sd0') to view and
-modify the partition sizes. A comfortable size for the root filesystem
-partition is about 20MB; a good initial size for the swap partition is
-twice the amount of physical memory in your machine (though, unlike
-SunOS 4.x, there are no restrictions on the size of the swap partition
-that would render part of your memory unusable). A full binary installation
-takes about 60MB in `/usr'. Make all your partitions start and end on
-cylinder boundaries.
+modify the partition sizes. See the section `Preparing your System for
+OpenBSD Installation' above for suggestions about disk partition sizes.
+Make sure all your partitions start and end on cylinder boundaries.
 
 NOTE: if you are installing on a SCSI disk that does *not* have a SunOS
 or OpenBSD label on it, you may still be able to use disklabel(8) but you'll
 have to create all partitions from scratch. If your disk is listed in
 `/etc/disktab', you may use the entry (which in most cases only defines
 a `c' partition to describe the whole disk) to put an initial label on
-the disk.
+the disk.  DO NOT USE `disklabel -r ...' TO INITIALIZE YOUR DISK LABEL;
+THIS WILL LEAD TO UNPREDICTABLE RESULTS. This deficiency will be fixed
+in a next release.
 
 Here follows an example of what you'll see while in the dislabel editor.
 Do not touch any of the parameters except for the `label: ' entry and
@@ -143,7 +202,7 @@ The size and offset fields are given in sector units. Be sure to make
 these numbers multiples of the of the number of sectors per cylinder:
 the kernel might be picky about these things, but aside from this you'll
 have the least chance of wasting disk space.
-Partitions on which you intend to have a a mountable filesystem, should
+Partitions on which you intend to have a mountable filesystem, should
 be given fstype `4.2BSD'. Remember, the `c' partition should describe
 the whole disk.
 The `(Cyl. x - y)' info that appears after the hash (`#') character is
@@ -156,7 +215,7 @@ the editor), then try setting it to `8 partitions:'.
 
 
 <BEGIN SAMPLE DISKLABEL SCREEN>
-openbsd# disklabel sd2
+OpenBSD# disklabel sd2
  # /dev/rsd2c:
 type: SCSI 
 disk: SCSI disk
@@ -186,11 +245,11 @@ drivedata: 0
 
 If you are upgrading a OpenBSD installation, start the upgrade script:
 
-openbsd# sh upgrade.sh
+OpenBSD# sh upgrade.sh
 
 else, start the installation script:
 
-openbsd# sh install.sh
+OpenBSD# sh install.sh
 
 
 These scripts will do most of the work of transferring the system from the
@@ -217,7 +276,7 @@ I'd suggest you "boot sd()bsd -bs", then try multiuser after that.
 if you boot single-user the OpenBSD incantation to make the root
 filesystem writable is
 
-    openbsd# mount -u /dev/sd0a /
+    OpenBSD# mount -u /dev/sd0a /
 
 The Sun monitor normally tries to load a file called "vmunix". On
 OpenBOOT ROM systems you can change it to load OpenBSD instead using
@@ -233,13 +292,13 @@ On version 2 OpenBOOT ROMs:
     ok setenv boot-device /sbus/esp/sd@0,0
 
 
-Congratulations, you have successfully installed OpenBSD RELEASE.  When you
+Congratulations, you have successfully installed OpenBSD 2.0.  When you
 reboot into OpenBSD, you should log in as "root" at the login prompt.
 There is no initial password, but if you're using the machine in a
 networked environment, you should create yourself an account and
 protect it and the "root" account with good passwords.
 
-Some of the files in the OpenBSD RELEASE distribution might need to be
+Some of the files in the OpenBSD 2.0 distribution might need to be
 tailored for your site.  In particular, the /etc/sendmail.cf file will
 almost definitely need to be adjusted, and other files in /etc will
 probably need to be modified.  If you are unfamiliar with UN*X-like
diff --git a/distrib/notes/sparc/whatis b/distrib/notes/sparc/whatis
index a81aa25ea87..7435a57969f 100644
--- a/distrib/notes/sparc/whatis
+++ b/distrib/notes/sparc/whatis
@@ -1,5 +1,5 @@
-OpenBSD RELEASE is the second release for the sparc. Many more sparc
-models and devices are now supported.
-In addition to the SunOS 4.1 compatibility present in OpenBSD/sparc 1.0,
-version RELEASE will also run some number of SunOS 5 (SVR4) executables
-in binary emulation mode.
+OpenBSD 2.0 is brought to you by the same people who did the first free
+BSD port (based on Chris Torek's 4.4BSD work).  Many more sparc models
+and devices are now supported.
+In addition to the SunOS 4.1 compatibility, OpenBSD 2.0 will also run some
+number of SunOS 5 (SVR4) executables in binary emulation mode.
diff --git a/distrib/notes/sparc/xfer b/distrib/notes/sparc/xfer
index 1e0c54398f1..221c6cb9f4a 100644
--- a/distrib/notes/sparc/xfer
+++ b/distrib/notes/sparc/xfer
@@ -9,18 +9,6 @@ you choose.  The various methods are explained below.
 
 To prepare for installing via an NFS partition:
 
-	Since the current OpenBSD/sparc installation program uses
-	a diskless setup for your workstation, you will already
-	have to prepare an NFS directory for use as a remote
-	root filesystem (see the section `Installing the OpenBSD System'
-	below for details). The easiest way is to put the OpenBSD filesets
-	in this root filesystem on the server where the install program
-	will find them.
-
-	However, you have the option to put the filesets in
-	another directory or even on another NFS server. To do
-	so, follow these guide lines:
-
 	Place the OpenBSD software you wish to install into
 	a directory on an NFS server, and make that directory
 	mountable by the machine which you will be installing
@@ -32,6 +20,13 @@ To prepare for installing via an NFS partition:
 	if the NFS server is not on a network which is
 	directly attached to the OpenBSD machine.
 
+	If you are using a diskless setup to install OpenBSD on
+	your machine, you can take advantage of the fact that
+	the above has already been done on your machine's server.
+	So, you can conveniently put the OpenBSD filesets in your
+	machine's root filesystem on the server where the install
+	program can find them.
+
 	Once you have done this, you can proceed to the next
 	step in the installation process, preparing your
 	system for OpenBSD installation.