Match reality

7 files changed, 629 insertions, 383 deletions

diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index e257ebaa9eb..951c08ac571 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -1,33 +1,17 @@
 TopPart
 
-		install/	Boot programs, a GENERIC kernel,
-				a stand-alone RAMDISK kernel,
-				and a miniroot filesystem image.
-				see below.
+OpenBSDdistsets
 
-		binary/		sun3 binary distribution sets;
-				see below.
+OpenBSDbsd
 
+OpenBSDrd
 
-The OpenBSD/sun3 "install" distribution contains files that can be
-used to install OpenBSD onto a completely "bare" sun3.  The files
-in the `.../install' directory are described below:
-
-	miniroot.gz	A gzipped copy of the miniroot filesystem.
-			This image is to be un-gzipped and copied
-			into the swap area of a disk.
-
-	bsd-rd.gz	A gzipped copy of the "RAMDISK kernel"
-			for installing the miniroot filesystem.
-
-	bsd-gen.gz	A gzipped GENERIC kernel (for upgrade)
-
-	netboot		A copy of the network boot program.
-			This is useful if you are installing
-			a diskless OpenBSD/sun3 system.
-
-	tapeboot	A copy of the tape boot program, used
-			as the first segment of a boot tape.
+		installboot	The OpenBSD/sun3 boot loader installation
+				program.
+		bootxx		The OpenBSD/sun3 boot block.
+		netboot		The OpenBSD/sun3 network boot loader.
+		tapeboot	The OpenBSD/sun3 tape boot loader.
+		ufsboot		The OpenBSD/sun3 disk boot loader.
 
 These files can be used to make a boot tape suitable for installing
 OpenBSD/sun3.  These files can also be used to configure an NFS server
@@ -36,21 +20,15 @@ the OpenBSD System onto Useful Media" for instructions on either method.
 
 DistributionDescription
 
-OpenBSDbase(7.2M,19M)
-
-OpenBSDcomp(4.6M,14.7M)
-
-OpenBSDetc(64K,348K)
+OpenBSDbase(19.4,61.9M)
 
-OpenBSDgame(2.8M,6.8M)
+OpenBSDcomp(13.1M,40.6M)
 
-OpenBSDman(850K,3.3M)
+OpenBSDetc(988K,3.2M)
 
-OpenBSDmisc(1.8M,6.5M)
+OpenBSDgame(2.6M,6.4M)
 
-OpenBSDxbase
+OpenBSDman(4.8M,18.4M)
 
-OpenBSDxfont
-	
-OpenBSDxserv
+OpenBSDmisc(1.6M,5.5M)
 
diff --git a/distrib/notes/sun3/hardware b/distrib/notes/sun3/hardware
index 13b8f5be016..5a17915c1f8 100644
--- a/distrib/notes/sun3/hardware
+++ b/distrib/notes/sun3/hardware
@@ -1,11 +1,10 @@
-
 OpenBSD/sun3 OSREV runs on most Sun3 machines, including:
 		3/50, 3/60, 3/110
-		3/75, 3/150, 3/160
+		3/75, 3/140, 3/150, 3/160, 3/180
 		3/260, 3/280
 
-OpenBSD/sun3 OSREV does not run on the Sun3/80 (sun3x class)
-because the sun3x MMU and other devices are very different.
+OpenBSD/sun3 OSREV does not run on the Sun3/80  and Sun3/4x0 (sun3x
+class) because the sun3x MMU and other devices are very different.
 
 The minimal configuration requires 4M of RAM and ~80MB of disk space.
 To install the entire system requires much more disk space (approx.
@@ -26,12 +25,12 @@ The following Sun3 hardware is supported:
 		On-board or VME Intel Ethernet (ie)
 
 	SCSI:  (Most SCSI disks, tapes, CD-ROMs, etc.)
-		On-board "si" (SCSI-3)  [Note 1]
-		VME "si" (SCSI-3) board [Note 1]
+		On-board "si" (SCSI-3)
+		VME "si" (SCSI-3) board
 
 	SMD Disks:  (the big, heavy ones 8^)
-		Xylogics 450/451  [Note 2]
-		Xylogics 753/7053 [Note 2]
+		Xylogics 450/451  [Note 1]
+		Xylogics 753/7053 [Note 1]
 
 	Input devices:
 		Sun keyboard and mouse
@@ -40,13 +39,6 @@ The following Sun3 hardware is supported:
 		Battery-backed real-time clock.
 
 Note 1:
-    The "si" driver now supports DMA and disconnect/reselect
-    but due to the immaturity of the DMA code, those features
-    are disabled by default.  To enable DMA (and get faster
-    SCSI performance) patch the variable si_options in the
-    file /usr/src/sys/arch/sun3/dev/ncr_si.c as indicated.
-
-Note 2:
     SMD disk support is almost ready, but could not be tested
     in time for this release.  Drivers are provided for the
     Xylogics 450/451 and Xylogics 753/7053 VME boards only as
diff --git a/distrib/notes/sun3/install b/distrib/notes/sun3/install
index 50e0106f828..6f574d6937d 100644
--- a/distrib/notes/sun3/install
+++ b/distrib/notes/sun3/install
@@ -1,176 +1,440 @@
-
 Installing OpenBSD is a relatively complex process, but if you have
-this document in hand it should not be too difficult.
-
-There are several ways to install OpenBSD onto your disk.  If your
-machine has a tape drive the easiest way is "Installing from tape"
-(details below).  If your machine is on a network with a suitable
-NFS server, then "Installing from NFS" is the next best method.
-Otherwise, if you have another Sun machine running SunOS you can
-initialize the disk on that machine and then move the disk.
-(Installing from SunOS is not recommended.)
-
-
-* Installing from tape:
-
-Create the OpenBSD/sun3 OSREV boot tape as described in the section
-entitled "Preparing a boot tape" and boot the tape.  At the PROM
-monitor prompt, use one of the commands:
-	>b st()
-	>b st(0,8,0)
-The first example will use the tape on SCSI target 4, where the
-second will use SCSI target 5.  The '>' is the monitor prompt.
-
-After the tape loads, you should see many lines of configuration
-messages, and then the following "welcome" screen:
-
-	Welcome to the OpenBSD/sun3 RAMDISK root!
+this document in hand it shouldn't be too much trouble.
 
-This environment is designed to do only three things:
-1:  Partition your disk (use the command:  edlabel /dev/rsd0c)
-2:  Copy a miniroot image into the swap partition  (/dev/rsd0b)
-3:  Reboot (using the swap partition, i.e. /dev/sd?b).
+There are several ways to install OpenBSD onto a disk. The easiest way
+in terms of preliminary setup is to use the OpenBSD miniroot that can
+be booted off a tape.
 
-Copying the miniroot can be done several ways, allowing
-the source of the miniroot image to be on any of these:
-    boot tape,  NFS server, TFTP server, rsh server
+If your Sun3 is hooked up in a network and you can find a server to
+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.
+This is difficult to get set up correctly the first time, but easy to
+use afterwards.  (see ``Installing using a diskless setup'' below).
 
-The easiest is loading from tape, which is done as follows:
-	mt -f /dev/nrst0 rewind
-	mt -f /dev/nrst0 fsf 2
-	dd bs=32k if=/dev/nrst0 of=/dev/rsd0b
-(For help with other methods, please see the install notes.)
+It is also possible to install OpenBSD "manually" from a running SunOS
+system, using SunOS tools and gnu tar and gunzip (see ``Installing from SunOS''
+below).
+
+
+This section of the install document is really broken into several parts:
 
-To reboot using the swap partition, first use "halt",
-then at the PROM monitor prompt use a command like:
-	b sd(,,1) -s
+	- booting from the installation media
+	- the miniroot install script
+	- after completing an installation
+	- installing from Sun OS
+	- net boot or diskless setup information
+
+The first section explains how to run tho install scripts. The second
+section gets you up to the point where you've booted the kernel from
+whatever media or setup described in the previous section, to where you
+have to respond to prompts from the install script.  The next section
+describes the path through the install script, and the remainder are
+notes which might be useful, but outside the bounds of simple "how two"
+instructions.
+
+
+
+Booting from the Installation Media:
+
+Prior to attempting an installation, you should make sure that everything
+of value on the target system has been backed up.  While installing OpenBSD
+does not necessarily wipe out all the partitions on the hard disk, errors
+during the install process can have unforeseen consequences and you will
+probably render the system unbootable if you start, but do not complete
+the installation.  Have the installation media for the prior installation,
+be it a SunOS or OpenBSD tape is good insurance if you want to be able to
+"go back" for some reason.
+
+After taking care of all that, bring your system down gracefully using
+the shutdown(8) and/or halt(8) commands.  This will get you to the monitor
+prompt.
+	
+Booting from SCSI tape
+
+Boot the miniroot by typing the appropriate command at the PROM:
+
+	> b st()
+	
+The above instructions assume your tape drive is the default tape drive
+using SCSI id 4. If your drive uses id 5, modify the boot command
+accordingly:
+
+	> b st(,28,)
+	
+This will cause the kernel contained in the miniroot to be booted.
+After the initial device probe messages you'll be asked to start the
+install or upgrade procedure. Proceed to the section ``Running the
+installation scripts'' below.
+
+
+Installing using a diskless setup
+
+First, you must setup a diskless client configuration on a server. If
+you are using a OpenBSD system as the boot-server, have a look at the
+diskless(8) manual page for guidelines on how to proceed with this.
+If the server runs another operating system, you'll have to consult
+documentation that came with it (on SunOS systems, add_client(8) and
+the Sun System/Networks administrators guide constitute a good start).
+
+
+Boot your workstation from the server by entering the appropriate `boot'
+command at the monitor prompt. Depending on the ethernet chip in your
+machine, this command takes one of the following forms:
+
+	> b le()bsd.rd		# for sun pizza boxes (3/50, 3/60)
+	> b ie()bsd.rd		# for other sun3s
+
+This will cause the kernel provided by the diskless setup 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.
+
+
+The miniroot install script:
+
+The following is a walk-through of the steps you will take while
+getting OpenBSD installed on your hard disk.  If any question has a
+default answer, it will be displayed in brackets ("[]") after the
+question.  If you wish to stop the installation, you may hit Control-C
+at any time, but if you do, you may have to begin the installation
+process again from scratch.  Using Control-Z to suspend the process
+may be a better option. 
+
+	Boot your machine from the installation media as described above.
+
+	It will take a while to load the kernel especially from a floppy
+	or slow network connection, most likely more than a minute.  If
+	some action doesn't eventually happen, or the spinning cursor has
+	stopped and nothing further has happened, either your boot medias
+	is probably bad, your diskless setup isn't correct or you may have
+	a hardware or configuration problem.
+
+	You will then be presented with the OpenBSD kernel boot
+	messages.  You will want to read them to determine your
+	disk's name and geometry.  Its name will be something like
+	"sd0" or "wd0" and the geometry will be printed on a line that
+	begins with its name.  As mentioned above, you will need your
+	disk's geometry when creating OpenBSD partitions.  You will
+	also need to know the device name to tell the install tools
+	what disk to install on.
+
+	While booting, you will probably see several warnings.  You
+	may be warned that the kernel can't figure out what device
+	it booted from and that no swap space is present.  Do not be
+	alarmed, these are completely normal.  The first warning
+	occurs because while OpenBSD/sun3 can boot from the floppy
+	drive, the kernel itself lacks a floppy driver for some
+        architectures.
+
+	When the loading process is complete, the boot floppy will be
+	ejected and you will be prompted to insert a filesystem floppy,
+	just hit return since the filesystem is contained in the kernel
+	image just loaded.  Next there will be a prompt asking you for
+	a shell name, just hit return to start executing the installation
+	setup script.
+
+	You will next be asked for your terminal type.  If you are
+	installing from a keyboard/monitor console, the default of
+	"sun" if correct.  If you are installing from a serial console
+	you should choose the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt100).  Next you
+	will be prompted for a choice of which text editor to use at
+	several places in the install script.  You will probably want
+	to use "vi" if your terminal supports this.
+
+	After entering the terminal type you will be greeted by a
+	welcome message and asked if you really want to continue.
+	Assuming you answered yes, the install program will then tell
+	you which disks of that type it can install on, and ask you
+	which it should use.  The name of the disk is typically "sd0".
+	Reply with the name of your disk.
+
+	Next you will have to edit or create a disklabel for the disk
+	OpenBSD is being installed on.  The installation script will
+	invoke the text editor allowing you to do this.  Note that
+	partition 'c' inside this disk label should ALWAYS reflect the
+	entire disk, including any non-OpenBSD portions.  The root file
+	system should be in partition 'a', and swap is usually in partition
+	'b'.  It is recommended that you create separate partitions for
+	root and /usr, you may also want to specify /var and /home
+	partitions.
+
+	The swap partition (usually 'b') should have a type of "swap", all
+	other native OpenBSD partitions should have a type of "4.2BSD".
+	Block and fragment sizes are usually 8192 and 1024 bytes, but can
+	also be 16384 and 2048 bytes.
+
+	The install program will now label your disk and ask which file
+	systems should be created on which partitions.  It will auto-
+	matically select the 'a' partition to be the root file system.
+	Next it will ask for which disk and partition you want a file
+	system created on.  This will be the same as the disk name (eg.
+	"sd0") with the letter identifying the partition (eg. "d")
+	appended (eg. "sd0d").  Then it will ask where this partition is
+	to be mounted, eg. /usr.  This process will be repeated until
+	you type "done".
+
+	At this point you will be asked to confirm that the file system
+	information you have entered is correct, and given an opportunity
+	to change the file system table.  Next it will create the new file
+	systems as specified, OVERWRITING ANY EXISTING DATA.  This is the
+	point of no return.
+
+	After all your file systems have been created, the install program
+	will give you an opportunity to configure the network.  The network
+	configuration you enter (if any) can then be used to do the install
+	from another system using NFS, HTTP or FTP, and will also be the
+	configuration used by the system after the installation is complete.
+
+	If you select to configure the network, the install program will
+	ask you for a name of your system and the DNS domain name to use.
+	Note that the host name should be without the domain part, and that
+	the domain name should NOT {:-include-:} the host name part.
+
+	Next the system will give you a list of network interfaces you can
+	configure.  For each network interface you select to configure, it
+	will ask for the IP address to use, the symbolic host name to use,
+	the netmask to use and any interface-specific flags to set.  The
+	interface-specific flags are usually used to determine which media
+	the network card is to use.  This is driver dependent, but for the
+	sun3 le(4) driver, the flags usually carry meaning:
+
+		-link0 -link1	Use existing setting (only setup by netboot)
+		link0 -link1	Use UTP (twisted pair) port
+		-link0 link1 	Use AUI port
+
+*** IMPORTANT - these are the correct setting for sun3 ethernet cards,
+		the suggestions shown by the install script are generic
+		and may or may not be correct...
+
+	After all network interfaces have been configured the install pro-
+	gram will ask for a default route and IP address of the primary
+	name server to use.  You will also be presented with an opportunity
+	to edit the host table.
+
+	At this point you will be allowed to edit the file system table
+	that will be used for the remainder of the installation and that
+	will be used by the finished system, following which the new file
+	systems will be mounted to complete the installation.
+
+	After these preparatory steps has been completed, you will be
+	able to extract the distribution sets onto your system.  There
+	are several install methods supported; FTP, HTTP, tape, CD-ROM, NFS
+	or a local disk partition.  To install from a tape, the distrib-
+	ution sets must have been written to tape prior to running the
+	installation program, either as tar images or as gzipped tar
+	images.  Note that installation sets on multiple floppies is not
+	currently supported.
+
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall({:-"wdN" or -:},{:-only -:})
+
+OpenBSDCommonFS
+		
+OpenBSDCommonURL
+
+After completing an installation:
+
+Now try a reboot.  (If needed, swap your scsi id's first).  Initially
+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 /
 
-To view this message again, type:  cat /.welcome
-
-[ End of "welcome" screen. ]
-
-Copy the miniroot as described in the welcome message, and
-reboot from that just installed miniroot.  See the section
-entitled "Booting the miniroot" for details.
-
-
-* Installing from NFS:
+OpenBSDCongratulations
 
-Before you can install from NFS, you must have already configured
-your NFS server to support your machine as a diskless client.
-Instructions for configuring the server are found in the section
-entitled "Getting the OpenBSD System onto Useful Media" above.
+If you will be running your OpenBSD system from a serial console, you may
+need to edit /etc/ttys and change the terminal type, and getty method from
+"sun" and "console" to "vt100" and "std.9600" or something similar.  Also
+when running from a serial console, you may wish to adjust the eeprom
+settings for input-device, output-device, screen-#columns, and screen-#rows
+as appropriate.  
 
-First, at the Sun PROM monitor prompt, enter a boot command
-using the network interface as the boot device.  On desktop
-machines this is "le", and "ie" on the others.  Examples:
+In order to use 'tip' on OpenBSD/sun3, you'll need to edit /etc/ttys
+and add "local" to the end of the tty configuration line, and run 
+'ttyflags -a' to put your changes into effect.
 
-	>b le() -s
-	>b ie() -s
+On installing X11 for OpenBSD/sun3, you may wish to add a line similar to
+'ldconfig /usr/X11R6/lib' to the end of your /etc/rc.local file.  This will
+add the X libraries to your dynamic linking search path at boot time.
 
-After the boot program loads the RAMDISK kernel, you should
-see the welcome screen as shown in the "tape boot" section
-above.  You must configure the network interface before you
-can use any network resources.  For example the command:
+If you are unfamiliar with UN*X-like system administration, 
+it's recommended that you buy a book that discusses it.
 
-	ssh> ifconfig le0 inet 192.333.20.198 up
 
-will bring up the network interface with that address.  The next
-step is to copy the miniroot from your server.  This can be done
-using either NFS or remote shell.  (In the examples that follow,
-the server has IP address 192.333.20.195)
 
-To load the miniroot from an NFS file:
+Installing from SunOS.
 
-	ssh> mount -r 192.333.20.195:/server/path /mnt
-	ssh> dd if=/mnt/miniroot of=/dev/rsd0b bs=8k
+You need a SunOS machine to install OpenBSD.  You also need at
+least the following pieces:
 
-To load the miniroot using rsh to the server:
+    the *.tgz files you want to install (as a minimum, base{:--:}OSrev.tgz)
+    gunzip (GNU gzip) SunOS binary
+    gtar (GNU tar) SunOS binary
+    a "/boot" file from a SunOS machine
+    a kernel, most likely "/bsd"
 
-	ssh> run -b dd if=/dev/pipe of=/dev/rsd0b bs=8k
-	ssh> run -o /dev/pipe rsh 192.333.20.195 zcat miniroot.gz
+All these pieces, except "/boot" and the GNU utilities are supplied in
+the OpenBSD/sun3 distribution.
 
-Note that "ssh" does not use "sh" syntax.  It is a very small
-shell designed for the ramdisk kernel.  The first command of the
-above pair runs a "dd" in the background reading /dev/pipe.  The
-second of the pair runs an "rsh" command with its standard output
-redirected to /dev/pipe.  In ssh, the "help" command will show you
-a list of commands and options (there are only a few).
+You need to format and partition the disk using SunOS (since
+OpenBSD/sun3 uses SunOS disk labels.)  Give yourself adequate
+partition sizes.  Here is an example layout:
 
+    partition    size   offset	  will be..
+    sd0a        28140        0	  /
+    sd0b        16170    28140	  swap
+    sd0c       204540        0	  `whole disk'
+    sd0g       160230    44310	  /usr
 
-* Booting the miniroot:
+BTW, These are not recommended sizes.
 
-If the miniroot was installed on partition 'b' of the disk with
-SCSI target ID=0 then the PROM boot command would be:
-	>b sd(0,0,1) -s
-With SCSI target ID=2, the the PROM is:
-	>b sd(0,10,1) -s
+Use SunOS to newfs the partitions which will have filesystems on them.
+(OpenBSD's filesystem format is identical to SunOS).
 
-The numbers in parentheses above are:
-	controller (usually zero)
-	unit number (SCSI ID * 8, in hexadecimal)
-	partition number
+    sunos# newfs /dev/rsd0a
+    [... lots of output]
+    sunos# newfs /dev/rsd0g
+    [... lots of output]
 
-Miniroot install program:
-------------------------
+NOTE: If you are able to, there is a performance benefit from
+newfs'ing using OpenBSD.  If you newfs using the OpenBSD newfs command,
+be sure to use the -O flag for your / partition, so that newfs will
+use the 4.3BSD filesystem format, rather than the new 4.4BSD filesystem
+format.  If you forget, you will not be able to boot -- the SunOS boot
+blocks do not understand the extended 4.4BSD filesystem format.
 
-The miniroot's install program is very simple to use.  It will guide
-you through the entire process, and is well automated.  Additional
-improvements are planned for future releases.
+Mount those partitions in a tree formation, under /mnt; ie:
 
-The miniroot's install program will:
+    sunos# df
+    Filesystem            kbytes    used   avail capacity  Mounted on
+    [...]
+    /dev/sd0a              11501       0   11501     0%    /mnt
+    /dev/sd0g             179529       0  179529     0%    /mnt/usr
 
-	* Allow you to place disklabels on additional disks.
-	  The disk we are installing on should already have
-	  been partitioned using the RAMDISK kernel.
+Place a standard SunOS "boot" program in /mnt (your new root
+partition), and use the SunOS command "installboot" to make it work.
+The installboot man page says to do something like this:
 
-	  Note that partition sizes and offsets are expressed
-	  in sectors.  When you fill out the disklabel, you will
-	  need to specify partition types and filesystem parameters.
-	  If you're unsure what the these values should be, use the
-	  following:
+    sunos# cp /usr/mdec/sdboot /mnt/boot
+    sunos# sync; sync
+    sunos# /usr/mdec/installboot -vlt /mnt/boot /usr/mdec/bootsd /dev/rsd0a
 
-		fstype: 4.2BSD
-		fsize: 1024
-		bsize: 4096
-		cpg: 16
+You can now extract the provided "*.tgz files onto your disk.
 
-	  If the partition will be a swap partition, use the following:
+    sunos# ls -FC
+    base{:--:}OSrev.tgz   comp{:--:}OSrev.tgz   man{:--:}OSrev.tgz       xfont{:--:}OSrev.tgz
+    bsd             etc{:--:}OSrev.tgz    misc{:--:}OSrev.tgz      xserv{:--:}OSrev.tgz
+    game{:--:}OSrev.tgz   xbase{:--:}OSrev.tgz
+    sunos{:-#-:} gunzip < base{:--:}OSrev.tgz | (cd /mnt; gtar xvpf -)
+    [...] for each set
 
-		fstype: swap
-		fsize: 0 (or blank)
-		bsize: 0 (or blank)
-		cpg: 0 (or blank)
+And finally copy the OpenBSD kernel onto your disk.
 
-	  The number of partitions is fixed at 8 (by the Sun PROM).
+    sunos# cp bsd /mnt/bsd
 
-	* Create filesystems on target partitions.
+The GNU gunzip and gtar programs are not distributed as part of SunOS,
+but may be present in your /usr/local/bin.  If not, you will need to obtain
+them from a GNU archive and install before proceeding.  The OpenBSD
+tar files are in the "new format" that includes directory information,
+and the standard SunOS tar will not extract from them successfully.
 
-	* Allow you to set up your system's network configuration.
-	  Remember to specify host names without the domain name
-	  appended to the end.  For example use `foo' instead of
-	  `foo.bar.org'.  If, during the process of configuring
-	  the network interfaces, you make a mistake, you will
-	  be able to re-configure that interface by simply selecting
-	  it for configuration again.
+After the files have been extracted, setup /mnt/etc/fstab to match
+your actual disk layout.  (Minus the "/mnt" component of each path, of
+course :-)
 
-	* Mount target filesystems.  You will be given the opportunity
-	  to manually edit the resulting /etc/fstab.
+Now proceed to reboot the machine and the customize your installation.
 
-	* Extract binary sets from the media of your choice.
 
-	* Copy configuration information gathered during the
-	  installation process to your root filesystem.
+Net Boot or Diskless Setup Information:
 
-	* Make device nodes in your root filesystem.
+The set up is similar to SunOS diskless setup, but not identical, because
+the Sun setup assumes that the bootblocks load a kernel image, which then
+uses NFS to access the exported root partition, while the OpenBSD bootblocks
+use internal NFS routines to load the kernel image directly from the
+exported root partition.
 
-	* Copy a new kernel onto your root partition.
+Please understand that no one gets this right the first try, since
+there is a lot of setup and all the host daemons must be running and
+configured correctly.  If you have problems, extract the diskless(8)
+manpage, find someone who's been through it before and use the host
+syslog and tcpdump(8) to get visibility of what's happening (or not).
 
-	* Install a new boot block.
+Your sun3 expects to be able to download a second stage bootstrap
+program via TFTP after having acquired its IP address through RevARP when
+instructed to boot "over the net". It will look for a filename
+corresponding to the machine's IP address. For example, a sun3 machine
+which has been assigned IP address 130.115.144.11, will make an TFTP
+request for `8273900B'.
+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/sun3
+distribution.
+
+Here's an example to illustrate this whole mess:
+
+    server# cd /<client-root-dir>/usr/mdec
+    server# cp boot /tftpboot/boot.sun3.OpenBSD
+    server# cd /tftpboot
+    server# ln -s boot.sun3.OpenBSD 8273900B
+
+
+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
+program starts reading from the remote root filesystem in search of the
+kernel which is then read into memory.
+
+You will want export the miniroot{:--:}OSrev.fs filesystem to the client.  You
+can dd this filesystem image to some spare partition, mount and export
+that partition or use tar to copy the contents to a more convenient spot.
+
+Alternatively you can build a bootable partition from the distribution sets
+as follows:
+
+Unpack `base{:--:}OSrev.tgz' and `etc{:--:}OSrev.tgz' on the server in the root directory
+for your target machine. If you elect to use a separately NFS-mounted
+filesystem for `/usr' with your diskless setup, make sure the "./usr" base
+files in base{:--:}OSrev.tgz end up in the correct location. One way to do this is
+to temporarily use a loopback mount on the server, re-routing <root>/usr to
+your server's exported OpenBSD "/usr" directory. Also put the kernel and
+the install/upgrade scripts into the root directory.
+
+A few configuration files need to be edited:
+
+	<root>/etc/hosts
+		Add the IP addresses of both server and client.
 
-	* Check your filesystems for integrity.
+	<root>/etc/myname
+		This files contains the client's hostname; use the same
+		name as in <root>/etc/hosts.
 
-First-time installation on a system through a method other than the
-installation program is possible, but strongly discouraged.
+	<root>/etc/fstab
+		Enter the entries for the remotely mounted filesystems.
+		For example:
+			server:/export/root/client       /     nfs  rw 0 0
+			server:/export/exec/sun3.OpenBSD /usr  nfs  rw 0 0
+
+Now you must populate the the `/dev' directory for your client. For
+this, you can simply change your working directory to `<root>/dev'
+and run the MAKEDEV script: `sh MAKEDEV all'.
 
-OpenBSDCongratulations
diff --git a/distrib/notes/sun3/prep b/distrib/notes/sun3/prep
index 064dd250b4a..d03b1885ca2 100644
--- a/distrib/notes/sun3/prep
+++ b/distrib/notes/sun3/prep
@@ -23,3 +23,54 @@ just a '.' if you don't want to change it).  Console values are:
 
 OpenBSD will use the EEPROM setting to determine which device to
 use as the console, so you should make sure it is correct.
+Before you start you might need to consider your disk configuration
+to sort out a quirk in SCSI-ID to SD-UNIT mapping that exists on
+Sun Sparcstations.
+
+Please note that while OpenBSD and SunOS have a reasonable degree of
+compatibility between disk labels and filesystems there are some problems
+to watch out for during initial installation or when trying to maintain
+both OpenBSD and SunOS environments on the same system.
+
+    If the OpenBSD fsck(8) utility is used on a SunOS filesystem, it will
+    set OpenBSD "clean flags" and BSD4.4 summary fields in the superblock.
+    SunOS does *not* like this and you will have to do a "fsck -b 32" under
+    SunOS to access an alternate superblock to repair the filesystem.  You
+    should always specify SunOS filesystem with a "pass number" of 0 in
+    their /etc/fstab entry to prevent this, and preferably mount them "RO".
+
+    If SunOS fsck is used on an OpenBSD filesystem in the default OpenBSD
+    (4.4BSD) format, it will first complain about the superblock and then
+    about missing . and .. entries.  Do *not* try to "correct" these
+    problems, as attempting to do so will completely trash the filesystem.
+
+    You should avoid using the new OpenBSD "-s enable" option to the 
+    "tunefs" command, which enable the soft update feature.  
+    Although untested, it is likely that SunOS would be confused by a 
+    filesystem with soft update flags enabled.
+
+OpenBSD supports both OpenBSD "native" disklabels and "Sun compatible"
+disklabels.  Unless you have some really good reason, you should stick
+with the Sun compatible labels.  The disklabel(8) "-r" switch says to
+use OpenBSD labels, which is a bit counter-intuitive and contrary to
+the reasons why might want to use "-r" on other OpenBSD ports.
+
+Don't use "-r" with disklabel(8).
+
+
+The OpenBSD "Sun Compatible" disklabel have been extended to support 16
+partitions, which may be compatible with Solaris, but the old SunOS
+format(8) utility only sees the first 8 partititions and may "lose"
+information about the extended partitions.
+
+Use SunOS format(8) only with *extreme* caution on drives that contain
+OpenBSD partitions.
+
+
+OpenBSD and Sun BSD bootblocks are similar in concept, though implemented
+differently.  The OpenBSD bootblocks are architecture independent and also
+understand the extended disklabels with 16 partitions.  You can use SunOS
+bootblocks, but remember that OpenBSD bootblocks must be installed with
+OpenBSD installboot and SunOS bootblocks with SunOS installboot.
+
+
diff --git a/distrib/notes/sun3/upgrade b/distrib/notes/sun3/upgrade
index c432d46fc3b..64a8f222f25 100644
--- a/distrib/notes/sun3/upgrade
+++ b/distrib/notes/sun3/upgrade
@@ -1,68 +1,10 @@
+To upgrade to OpenBSD OSREV from a previous version start with the general
+instructions in the section "Installing OpenBSD".
 
-There is no automated upgrade program in this release.
-(This is the first official release for the Sun3 anyway.)
-However, it is possible to upgrade your system manually.
+After booting with the miniroot, select the (U)pdate option rather than
+the (I)nstall option at the prompt in the install process.
 
-Manual upgrade procedure:
+The upgrade script will use the existing disk partitions to install the
+new system in, and also preserves files in `/etc' which you are likely
+to have customized since a previous installation.
 
-	* Place _at least_ the `base' binary set in a filesystem
-	  accessible to the target machine.  A local filesystem
-	  is preferred, since there may be incompatibilities
-	  between the OpenBSD OSREV kernel and older route(8)
-	  binaries.
-
-	* Back up your pre-existing kernel and copy the OSREV
-	  kernel into your root partition.
-
-	* Reboot with the OSREV kernel into single-user mode.
-
-	* Check all filesystems:
-
-		/sbin/fsck -p
-
-	* Mount all local filesystems:
-
-		/sbin/mount -a -t nonfs
-
-	* If you keep /usr or /usr/share on an NFS server, you
-	  will want to mount those filesystems as well.  To do
-	  this, you will need to enable the network:
-
-		sh /etc/netstart
-
-	  NOTE: the route(8) commands may fail due to potential
-	  incompatibilities between route(8) and the OpenBSD OSREV
-	  kernel.  Once you have enabled the network, mount the
-	  NFS filesystems.  If you use amd(8), you may or may not
-	  have to mount these filesystems manually.  Your mileage
-	  may vary.
-
-	* Make sure you are in the root filesystem and extract
-	  the `base' binary set:
-
-		cd /
-		tar -xzvpf /path/to/base{:--:}OSrev.tgz
-
-	* Install a new boot block:
-
-		cd /usr/mdec
-		cp -p ./ufsboot /mnt/ufsboot
-		sync ; sleep 1 ; sync
-		./installboot /mnt/ufsboot bootxx /dev/rsd0a
-		# Substitute your root partition here -^
-
-	* Sync the filesystems:
-
-		sync
-
-	* At this point you may extract any other binary sets
-	  you may have placed on local filesystems, or you may
-	  wish to extract additional sets at a later time.
-	  To extract these sets, use the following commands:
-
-		cd /
-		tar -xzvpf <path to set>
-
-NOTE: you SHOULD NOT extract the `etc' set if upgrading.  Instead,
-you should extract that set into another area and carefully merge
-the changes by hand.
diff --git a/distrib/notes/sun3/whatis b/distrib/notes/sun3/whatis
index ddc58677f59..56f9bdd8219 100644
--- a/distrib/notes/sun3/whatis
+++ b/distrib/notes/sun3/whatis
@@ -2,21 +2,19 @@
 OpenBSD OSREV is the first "full" release of OpenBSD for the sun3,
 including a full set of binaries.  This binary distribution is
 referred to elsewhere in this document by the name OpenBSD/sun3.
-This release offers improved stability and many new features.
 
-New features added since the 1.0 release {:-include-:}:
+This release offers the following features:
+
 * Native boot programs for disk, network, and tape
 * Automated installation tools (using a "miniroot")
-* New SCSI driver supporting DMA, interrupts, and
+* SCSI driver supporting DMA, interrupts, and
   disconnect/reselect with SCSI-2 devices (optional)
-* Frame buffer drivers for bwtwo, cgtwo, and cgthree,
+* Frame buffer drivers for bwtwo, cgtwo, cgfour,
   all compatible with SunOS and the X Window System
 * Support for the Virtually Addressed Cache (VAC) on
   Sun3/260 models (and vastly improved performance)
 * SMD disk drivers -- almost (still need testing)
-
-Old features (from 1.0 and earlier) worth mentioning:
 * SunOS 4.1 compatibility (runs most Sun3 applications)
 * Supports most SCSI devices (CD-ROM, etc)
 * Diskless boot capability
-* Built-in kernel debugger
+
diff --git a/distrib/notes/sun3/xfer b/distrib/notes/sun3/xfer
index 4962cafcf51..296b2051b39 100644
--- a/distrib/notes/sun3/xfer
+++ b/distrib/notes/sun3/xfer
@@ -1,125 +1,146 @@
-
 Installation is supported from several media types, including:
-	* Tape
-	* NFS
-	* CD-ROM
-	* FTP
-
-Note that installing on a "bare" machine requires some bootable
-device; either a tape drive or Sun-compatible NFS server.
-
-The procedure for transferring the distribution sets onto
-installation media depends on the type of media.  Instructions
-for each type of media are given below.
-
-In order to create installation media, you will need all the 
-files in these two directories:
-	.../OSREV/sun3/install
-	.../OSREV/sun3/binary
-
-* Creating boot/install tapes:
-
-Installing from tape is the simplest method of all.
-This method uses two tapes; one called the "boot"
-tape, and another called the "install" tape.
-
-The boot tape is created as follows:
-
-	cd .../OSREV/sun3/install
-	set T = /dev/nrst0
-	mt -f $T rewind
-	dd if=tapeboot of=$T bs=8k conv=sync
-	dd if=bsd-rd of=$T bs=8k conv=sync
-	gzip -d < miniroot.gz | dd of=$T bs=8k
-	mt -f $T rewind
-
-The install tape is created as follows:
-
-	cd .../OSREV/sun3/install
-	set T = /dev/nrst0
-	mt -f $T rewind
-	foreach f (base etc comp games man misc)
-	  gzip -d < $f.gz | dd of=$T bs=8k
-	end
-	mt -f $T rewind
-
-If the tapes do not work as expected, you may need to explicitly
-set the EOF mark at the end of each tape segment.  It may also be
-necessary to use the `conv=osync' argument to dd(1).  Note that
-this argument is incompatible with the `bs=' argument.  Consult
-the tape-related manual pages on the system where the tapes are
-created for more details.
-
-* Boot/Install from NFS server:
-
-If your machine has a disk and network connection, but no tape drive,
-it may be convenient for you to install OpenBSD over the network.  This
-involves temporarily booting your machine over NFS, just long enough
-so you can initialize its disk.  This method requires that you have
-access to an NFS server on your network so you can configure it to
-support diskless boot for your machine.  Configuring the NFS server
-is normally a task for a system administrator, and is not trivial.
-
-If you are using a OpenBSD system as the boot-server, have a look at
-the diskless(8) manual page for guidelines on how to proceed with
-this.  If the server runs another operating system, consult the
-documentation that came with it (i.e. add_client(8) on SunOS).
-
-Your Sun3 expects to be able to download a second stage bootstrap
-program via TFTP after having acquired its IP address through RARP
-when instructed to boot "over the net".  It will look for a filename
-derived from the machine's IP address expressed in hexadecimal.  For
-example, a sun3 which has been assigned IP address 130.115.144.20
-will make an TFTP request for `8273900B'.  Normally, this file is a
-symbolic link to the OpenBSD/sun3 "netboot" 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).  The netboot program
-may be found in the install directory of this distribution.
-
-The netboot program will query a bootparamd server to find the
-NFS server address and path name for its root, and then load a
-kernel from that location.  The server should have a copy of the
-bsd-rd kernel in the root area for your client (no other files
-are needed in the client root) and /etc/bootparams on the server
-should have an entry for your client and its root directory.
-The client will need access to the miniroot image, which can be
-provided using NFS or remote shell.  If using NFS, miniroot.gz
-must be expanded on the server, because there is no gzip program
-in the RAMDISK image.  The unzipped miniroot takes 8MB of space.
-
-If you will be installing OpenBSD on several clients, it may be useful
-to know that you can use a single NFS root for all the clients as long
-as they only use the bsd-rd kernel.  There will be no conflict
-between clients because the RAM-disk kernel will not use the NFS root.
-No swap file is needed; the RAM-disk kernel does not use that either.
-
-* Install/Upgrade from CD-ROM:
-
-This method requires that you boot from another device (i.e. tape
-or network, as described above).  You may need to make a boot tape
-on another machine using the files provided on the CD-ROM.  Once
-you have booted bsd-rd (the RAM-disk kernel) and loaded the
-miniroot, you can load any of the distribution sets directly from
-the CD-ROM.  The "install" program in the miniroot automates the
-work required to mount the CD-ROM and extract the files.
-
-* Install/Upgrade via FTP:
-
-This method requires that you boot from another device (i.e. tape
-or network, as described above).  You may need to make a boot tape
-on another machine using the files in .../install (which you get
-via FTP).  Once you have booted bsd-rd (the RAM-disk kernel)
-and loaded the miniroot, you can load any of the distribution sets
-over the net using FTP.  The "install" program in the miniroot
-automates the work required to configure the network interface and
-transfer the files.
-
-This method, of course, requires network access to an FTP server.
-This might be a local system, or it might even be ftp.OpenBSD.ORG
-itself.  If you wish to use ftp.OpenBSD.ORG as your FTP file
-server, you may want to keep the following information handy:
-
-	IP Address: 128.6.190.2
-	Login: anonymous
-	Password: <your e-mail address>
-	Server path: /pub/OpenBSD/OSREV/sun3/bins
+
+	FFS partitions
+	Tape
+	Remote NFS partition
+	FTP
+	HTTP
+
+However, you can only boot the installation procedure from tape or
+network. This requires some setup work to prepare a bootable image,
+either a tape, or a compatible net boot server.
+
+Although you can access the distribution sets directly from one of the
+FTP mirrors over the internet, you may wish to transfer the sets to a
+local FTP or NFS server, or copy them to a partition on the target
+system's disk or onto a SCSI tape.
+
+The variety of options listed may seem confusing, but situations vary
+widely in terms of what peripherals and what sort of network arrangements
+a user has, the intent is to provide some way that will be practical.
+
+
+Creating a network bootable setup using SunOS or other Un*x-like system:
+
+	The details of setting up a network bootable environment vary
+	considerably, depending on the networks host.  Extract the
+	OpenBSD diskless(8) man page from the man{:--:}OSrev.tgz distribution
+	set or see the copy on the OpenBSD web page.  You will also
+	need to reference the relevant man pages or administrators guide
+	for the host system.
+	
+	Basically, you will need to set up reverse-arp (rarpd) and boot
+	parameter (bootpd) information and make the OpenBSD bootblock,
+	kernel/miniroot partition, and a swap file available as required
+	by the netboot setup.
+
+
+
+The steps necessary to prepare the distribution sets for installation
+depend on which method of installation you choose.  Some methods
+require a bit of setup first that is explained below.
+
+The installation allows installing OpenBSD directly from FTP mirror
+sites over the internet, however you must consider the speed and
+reliability of your internet connection for this option.  It may save
+much time and frustration to use ftp get/reget to transfer the
+distribution sets to a local server or disk and perform the installation
+from there, rather than directly on the internet.
+
+
+To install or upgrade OpenBSD using a tape, you need to do the following:
+
+	To install OpenBSD from a tape, you need to make a tape that
+	contains the distribution set files, each in "tar" format or
+	in "gzipped tar format".  First you will need to transfer the
+	distribution sets to your local system, using ftp.  Then you
+	need to make a tape containing the files.
+
+	If you're making the tape on a UN*X-like system, the easiest way
+	to do so is make a shell script along the following lines, call it
+	"/tmp/maketape".
+
+	#! /bin/sh
+	tape=/dev/nrst0
+	mt -f ${tape} rewind
+	if test $# -lt 1
+	then
+		for file in tapeboot bsd.rd
+		do
+			dd if=${file} of=${tape} obs=8k conv=sync
+		done
+	fi
+	for file in base etc comp game man misc
+	do
+		dd if=${file}OSrev.tgz of=${tape} obs=8k conv=sync
+	done
+	tar cf ${tape} bsd
+	mt -f ${tape} offline
+	# end of script
+
+
+	And then:
+
+	cd .../OSREV/sun3
+	sh -x /tmp/maketape
+
+	
+	Note that this script creates a bootable tape. If you only want to
+	fetch the OpenBSD files from tape, but want to boot from another
+	device, you can save time and space creating the tape this way:
+
+	cd .../OSREV/sun3
+	sh -x /tmp/maketape noboot
+
+	
+If you're using a system other than OpenBSD or SunOS, the tape name and
+other requirements may change.
+
+
+To install OpenBSD using a remote partition, mounted via
+NFS, you must do the following:
+
+	NOTE:	This method of installation is recommended only for
+		those already familiar with using BSD network
+		configuration and management commands.  If you aren't,
+		this documentation should help, but is not intended to
+		be all-encompassing.
+
+	Place the OpenBSD distribution sets you wish to install into a
+	directory on an NFS server, and make that directory mountable
+	by the machine on which you are installing or upgrading OpenBSD.
+	This will probably require modifying the /etc/exports file on
+	of the NFS server and resetting its mount daemon (mountd).
+	(Both of these actions will probably require superuser
+	privileges on the server.)
+
+	You need to know the the numeric IP address of the NFS server,
+	and, if the server is not on a network directly connected to
+	the machine on which you're installing or upgrading OpenBSD,
+	you need to know the numeric IP address of the router closest
+	to the OpenBSD machine.  Finally, you need to know the numeric
+	IP address of the OpenBSD machine itself.
+
+	Once the NFS server is set up properly and you have the
+	information mentioned above, you can proceed to the next step
+	in the installation or upgrade process.  If you're installing
+	OpenBSD from scratch, go to the section on preparing your hard
+	disk, below.  If you're upgrading an existing installation, go
+	directly to the section on upgrading.
+
+If you are upgrading OpenBSD, you also have the option of installing
+OpenBSD by putting the new distribution sets somewhere in your existing
+file system, and using them from there.  To do that, you must do the
+following:
+
+	Place the distribution sets you wish to upgrade somewhere in
+	your current file system tree.  At a bare minimum, you must
+	upgrade the "base" binary distribution, and so must put the
+	"base{:--:}OSrev" set somewhere in your file system.  If you wish,
+	you can do the other sets, as well, but you should NOT upgrade
+	the "etc" distribution; the "etc" distribution contains system
+	configuration files that you should review and update by hand.
+
+	Once you have done this, you can proceed to the next step in
+	the upgrade process, actually upgrading your system.
+