Your average close-to-release distrib/notes/FOO update.

This time:
- update hardware list, reorganize it more logically
- gets most of the bsd.rd description and instructions on par with other
  arches
- document hov to create a boot tape, and how to boot via s-records
- tries to be more verbose about board setup

This is still way too concise. If you write english better than me (trivial)
and know mvme68k a bit, you're welcome to help fill the blanks.

At least this is better than the existing instructions, and deraadt@ agrees.

5 files changed, 377 insertions, 324 deletions

diff --git a/distrib/notes/mvme68k/hardware b/distrib/notes/mvme68k/hardware
index 528fb62008a..1db659d3ac7 100644
--- a/distrib/notes/mvme68k/hardware
+++ b/distrib/notes/mvme68k/hardware
@@ -2,94 +2,67 @@ OpenBSD/MACHINE OSREV runs on the following classes of machines:
 	- MVME147 - Motorola with 68030 and 68881
 	- MVME162 - Motorola with 68040
 	- MVME167 - Motorola with 68040
+	- MVME172 - Motorola with 68060
 	- MVME177 - Motorola with 68060
 
-The minimal configuration requires 4M of RAM and ~60M of disk space.
+The minimal configuration requires 8M of RAM and ~60M of disk space.
 To install the entire system requires much more disk space, and to 
-compile the system, more RAM is recommended (OpenBSD with 4M of
-RAM feels like Solaris with 4M of RAM). Note that until you have
+compile the system, more RAM is recommended (OpenBSD with 8M of
+RAM feels like Solaris with 8M of RAM). Note that until you have
 around 16M of RAM, getting more RAM is more important than getting a
-faster CPU).
+faster CPU board).
 
 Supported devices {:-include-:}:
 
 MVME147:
 	serial ports: 
-		on-board ttya and ttyb 
-
+		on-board ttya-ttyd
 	ethernet:
 		on-board AMD 7990 Lance ethernet ("le0")
-	
 	SCSI:
-		on-board 
-
+		on-board WD33C93 controller
 	parallel:
 		a driver exists, but it is not integrated.
+	VMEbus:
+		not supported (some cards have issues)
 
-MVME162:
+MVME162, MVME172:
 	serial ports:
 		on-board tty00-03 - Zilog Z85230 SCC
-
 	ethernet:
 		on-board Intel 82596CA ethernet ("ie0")
-
 	SCSI:
-		on-board SCSI controller NCR53c710
-
+		on-board NCR53c710 controller
 	VME:
 		drivers for short I/O access
-
 	Flash:
 		1 MB flash, either Intel 28F008SA or 28F020
 		driver is available, but doesn't work
 		Jumper GPIO3 selects Flash memory map and must
 		be installed for booting with the Flash driver (default)
-
 	SRAM:
 		supported
-
 	VMEbus:
 		untested
-
 	IP:
 		untested
 
-MVME167:
+MVME167, MVME177:
 	serial:
 		on-board tty00 - tty03 - Cirrus Logic CD2401
 	ethernet: 
 		on-board Intel 82596CA ethernet ("ie0")
 	SCSI: 
-		on-board SCSI controller NCR53c710
-
+		on-board NCR53c710 controller
 	parallel:
-		Not supported
-
+		not supported
 	SRAM:
 		supported
-	
 	VMEbus:
 		supported
 		
-MVME177:
-	serial:
-		on-board tty00 - tty03 - Cirrus Logic CD2401
-
-	ethernet: 
-		on-board Intel 82596CA ethernet ("ie0")
 
-	SCSI: 
-		on-board SCSI controller NCR53c710
-
-	parallel:
-		Not supported
-
-	SRAM:
-		supported
-	
-	VMEbus:
-		supported
-		
+Faithful clones of the above boards should also work.
 
 Additional VMEbus devices {:-include-:}:
 
diff --git a/distrib/notes/mvme68k/install b/distrib/notes/mvme68k/install
index d1895a3e44c..4ef7ade1a28 100644
--- a/distrib/notes/mvme68k/install
+++ b/distrib/notes/mvme68k/install
@@ -2,53 +2,251 @@ OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that can
-be booted from tape. Alternatively, if your mvme68k 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).
+be booted from tape.
 
+Alternatively, if your MACHINE is hooked up in a network 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).
 
-Installing using the OpenBSD ramdisk kernel.
 
-The ramdisk kernel is a kernel that containes an OpenBSD filesystem holding 
-all utilities necessary to install OpenBSD on a local disk. It is distributed 
-as a binary file with the name bsd.rd.  The ramdisk kernel can be loaded via 
-a network boot-server.  This is the fastest installation method.  It also may 
-loaded via tape. 
+Booting from the Installation Media:
 
-After the initial probe messages you'll asked to start the install
-or upgrade procedure. Proceed to the section `Running the installation
-scripts' below.
+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.  Having the installation media for the prior installation,
+like a Motorola SystemV/MACHINE 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 BUG
+prompt.
+
+
+Booting from SCSI tape:
+
+After creating the boot tape, boot it by typing the appropriate command
+at the PROM:
+
+	167-bug> bo xx yy
+
+Where `xx' is the SCSI controller number (00 for the built-in SCSI
+controller), and `yy' is ten times the tape drive ID, except for the
+MVME147, where `xx' should be the tape drive ID, and `yy' should be 00.
+
+For example, booting from a tape drive using SCSI id 4:
+	147-bug> bo 04 00
+for a MVME147, and
+	167-bug> bo 00 40
+for any other MACHINE board.
+
+
+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).
+
+You should then setup your workstation using the NIOT command at the BUG
+prompt. The Load Address should be 0x3F0000, and the Execution Address
+should be 0x3F0000 as well. You may now boot your workstation from the
+server by entering the NBO command at the BUG prompt:
+	
+	167-bug> nbo 00 00 bsd.rd
 
+If your BUG version does not understand the NIOT and NBO commands (most
+MVME147 don't), you will have to boot via S-Records.
 
-Installing using a diskless setup.
+
+Booting from S-Records:
 
 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) is a
-good start).
+documentation that came with it (on SunOS systems, add_client(8) and
+the Sun System/Networks administrators guide constitute a good start).
+
+Second, make sure you use a terminal emulator able to read files from the
+local machine and send their contents over the serial link. OpenBSD ships
+with both cu(1) and tip(1), but others can be used.
+
+After reseting your MACHINE board, enter "LO" at the BUG prompt. If you get
+an error message, switch directories (enter "SD") and retry. The MACHINE
+should be awaiting a S-Record program now.
+
+From your terminal emulator, send the contents of the ``sboot'' file over
+the line. Depending on the speed of the serial link, this will take some
+time, but no more than a couple of minutes.
+
+If you don't get a prompt back after a few minutes, send a break, reset
+your MACHINE board, and retry.
+
+When the transfer is finished, enter "GO" at the BUG prompt.  The S-Records
+boot loader will start.  This is a very crude bootloader which will attempt
+to fetch a secondary boot program via TFTP requests, like the NBO command.
+
+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.
+
+
+
+Installing using the tape or netboot procedure:
+
+OpenBSDInstallPart2
+
+	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 media
+	is bad, your diskless setup isn't correct, or you may have
+	a hardware or configuration problem.
+
+OpenBSDBootMsgs
+
+	While booting, you will probably see several warnings.  You
+	may be warned that the kernel can't figure out what device
+	it booted from.  Do not be alarmed, this is completely normal.
+	This warning occurs because while OpenBSD/MACHINE can boot from
+	the floppy drive, the kernel itself lacks a floppy driver for some
+	MACHINE models.
+
+	You will next be asked for your terminal type.  You should choose
+	the terminal type from amongst those listed.
+	(If your terminal type is xterm, just use vt100).
+
+	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 (e.g.
+	"sd0") with the letter identifying the partition (e.g. "d")
+	appended (e.g. "sd0d").  Then it will ask where this partition is
+	to be mounted, e.g. /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 media flags to set.
+
+	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
 
-Second, you must configure the netboot parameters in the mvme68k Bug 
-using the NIOT command.  The Load Address should be 0x3F0000.  The 
-Execution Address should be 0x3F0000.
+OpenBSDHTTPInstall
 
-Your mvme68k expects to be able to download a second stage bootstrap
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+		
+OpenBSDNFSInstall
+
+OpenBSDDISKInstall(,{:-only -:})
+
+OpenBSDCommonFS
+		
+OpenBSDCommonURL
+
+OpenBSDCongratulations
+
+
+
+Net Boot or Diskless Setup Information:
+
+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.
+
+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).
+
+Your MACHINE 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 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 a file that has 
-been named in the nvram.  Normally, this file is a second-stage
+by a period. For example, a MACHINE board which has been assigned IP
+address 130.115.144.11, will make an TFTP request for `8273900B.MACHINE'.
+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/netboot' in the OpenBSD/mvme68k
-distribution. 
+
+You can find the boot program in `/usr/mdec/netboot' in the OpenBSD/MACHINE
+distribution.
 
 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 BUG, 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
@@ -62,19 +260,13 @@ 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.
 
-
-As noted above in the section `Preparing your System for OpenBSD Installation',
-you have several options when choosing a location to store the installation
-filesets. However, the easiest way is to put the *.tgz files you want
-to install into the root directory for your client on the server.
-
-Next, unpack `base{:--:}OSrev.tgz' and `etc.{:--:}OSrev.tgz' on the server in the root 
-directory for your machine. If you elect to use a separately NFS-mounted
+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.
+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:
 
@@ -89,9 +281,9 @@ 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.OpenBSD /usr  nfs  rw 0 0
+			server:/export/exec/MACHINE.OpenBSD /usr  nfs  rw 0 0
 
-Now you must populate the `/dev' directory for your client. If you server
+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'
 and run the MAKEDEV script: `sh MAKEDEV all'.
 
@@ -100,155 +292,3 @@ messages about unknown user and groups. These errors are inconsequential
 for the purpose of installing OpenBSD. However, you may want to correct them
 if you plan to the diskless setup regularly. In that case, you may re-run
 MAKEDEV on your OpenBSD machine once it has booted.
-
-Boot your workstation from the server by entering the appropriate `boot'
-command at the monitor prompt. Depending on the PROM version in your machine,
-this command takes one of the following forms:
-
-	167-bug> nbo 00 00 bsd -s
-
-This will boot the OpenBSD kernel in single-user mode.
-	
-	167-bug> nbo 00 00 bsd.rd
-
-This will boot the OpenBSD ramdisk kernel.
-
-If you use a diskless setup with a separately NFS-mounted /usr filesystem,
-mount /usr by hand now:
-
-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. 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.  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 disklabel editor.
-Do not touch any of the parameters except for the `label: ' entry and
-the actual partition size information at the bottom (the lines starting
-with `a:', `b:', ...).
-
-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 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
-treated as a comment and need not be filled in when altering partitions.
-
-Special note: the line containing `8 partitions:' is best left alone,
-even if you {:-define-:} less then eight partitions. If this line displays
-a different number and the program complains about it (after you leave
-the editor), then try setting it to `8 partitions:'.
-
-
-<BEGIN SAMPLE DISKLABEL SCREEN>
-OpenBSD# disklabel sd2
-# /dev/rsd2c:
-type: SCSI
-disk: SCSI disk
-label: Hold Your Breath
-flags:
-bytes/sector: 512
-sectors/track: 124
-tracks/cylinder: 8
-sectors/cylinder: 992
-cylinders: 4177
-total sectors: 4165271
-rpm: 3600
-interleave: 1
-trackskew: 0
-cylinderskew: 0
-headswitch: 0           # microseconds
-track-to-track seek: 0  # microseconds
-drivedata: 0
-
-8 partitions:
-#        size   offset    fstype   [fsize bsize   cpg]
-  a:    80000        0    4.2BSD     1024  8192    16   # (Cyl.    0 - 80*)
-  b:   256000    80000      swap                        # (Cyl.   80*- 338*)
-  c:  4165271        0    unused        0     0         # (Cyl.    0 - 4198*)
-  d:  3229271   936000    4.2BSD     1024  8192    16   # (Cyl.  943*- 4198*)
-  f:   100000   336000    4.2BSD     1024  8192    16   # (Cyl.  338*- 439*)
-  g:   100000   436000    4.2BSD     1024  8192    16   # (Cyl.  439*- 540*)
-  h:   400000   536000    4.2BSD     1024  8192    16   # (Cyl.  540*- 943*)
-<END SAMPLE DISKLABEL SCREEN>
-
-
-If you are upgrading a OpenBSD installation, start the upgrade script:
-
-OpenBSD# sh upgrade.sh
-
-else, start the installation script:
-
-OpenBSD# sh install.sh
-
-
-These scripts will do most of the work of transferring the system from the
-tar files onto your disk. You will frequently be asked for confirmation
-before the script proceeds with each phase of the installation process.
-Occasionally, you'll have to provide a piece of information such as the
-name of the disk you want to install on or IP addresses and domain names
-you want to assign. If your system has more than one disk, you may want
-to look at the output of the dmesg(8) command to see how your disks
-have been identified by the kernel.
-
-The installation script goes through the following phases:
-
-	- determination of the disk to install OpenBSD on
-	- checking of the partition information on the disk
-	- creating and mounting the OpenBSD filesystems
-	- setup of IP configuration
-	- extraction of the distribution tar files
-	- installation of boot programs
-
-OpenBSDFTPInstall
-
-OpenBSDHTTPInstall
-
-OpenBSDTAPEInstall
-
-OpenBSDNFSInstall
-
-OpenBSDDISKInstall(,{:-only-:})
-
-OpenBSDCommonFS
-
-OpenBSDCommonURL
-
-After completing an installation:
-
-Now try a reboot.  (If needed, swap your scsi id's first).  Initially
-I'd suggest you "bo 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 /
-
-Congratulations, you have successfully installed OpenBSD OSREV.  When you
-reboot into OpenBSD, you should log in as "root" at the login prompt.
-You should create yourself an account and protect it and the "root" account 
-with good passwords. 
-
-Some of the files in the OpenBSD OSREV distribution might need to be
-tailored for your site.  In particular, the /etc/mail/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
-system administration, it's recommended that you buy a book that
-discusses it.
-
diff --git a/distrib/notes/mvme68k/prep b/distrib/notes/mvme68k/prep
index 5b1a02d4213..ff86e3efbcf 100644
--- a/distrib/notes/mvme68k/prep
+++ b/distrib/notes/mvme68k/prep
@@ -1,25 +1,27 @@
-;
-; This section should talk about setting up the NVRAM environment
-; on the various models.
-;
-MVME162:
+Before installing OpenBSD on your machine, you will want to check your
+machine's NVRAM settings.
+
+The defaults settings are usually suitable for OpenBSD; make sure the
+environment is configured in BUG mode. You can check and change this with
+the ENV command.
+
+You wil need to check that the ethernet address is correct as well, with
+the LSAD command.
 
+Some models also require specific preparation:
+MVME147:
+	Make sure the word at memory FFFE0764 is correct. Its value should
+	be zero if you don't have any VMEBus memory cards. You can change
+	its value with the MM command.
+
+MVME162:
 	Be sure to use the SET command to set the date before trying
 	to use the ethernet support in the 162-Bug.
 
-MVME162/167/177:
+If you plan to boot from the network, make sure your ENV settings match
+the following setup:
 
-162-Bug> env
-Local SCSI Bus Reset on Debugger Startup [Y/N] = N? y
 Network Auto Boot Enable [Y/N]   = N? y
 Network Auto Boot at power-up only [Y/N] = Y? n
 Network Auto Boot Abort Delay    = 5? 2
 Network Auto Boot Configuration Parameters Pointer (NVRAM) = 00000000? fffc0080
-Update Non-Volatile RAM (Y/N)? y
-Reset Local System (CPU) (Y/N)? y
-
-
-MVME147:
-
-	May need to set the ethernet address using the LSAD 147-Bug command.
-
diff --git a/distrib/notes/mvme68k/whatis b/distrib/notes/mvme68k/whatis
index 223caca19ae..c6c4bf497db 100644
--- a/distrib/notes/mvme68k/whatis
+++ b/distrib/notes/mvme68k/whatis
@@ -1,5 +1,6 @@
-OpenBSD/mvme68k OSREV was written under contract for Willowglen Singapore
+OpenBSD/MACHINE OSREV was written under contract for Willowglen Singapore
 for an embedded application.  Theo de Raadt, Dale Rahn, Chuck Cranor, 
 and Steve Murphree were involved in working on this port which runs on 
-the MVME147, MVME162, MVME167, MVME177 and perhaps other models also.
+the MVME147, MVME162, MVME167, MVME172, MVME177 and perhaps other models
+also.
 
diff --git a/distrib/notes/mvme68k/xfer b/distrib/notes/mvme68k/xfer
index 24076e049e5..f157639ab9d 100644
--- a/distrib/notes/mvme68k/xfer
+++ b/distrib/notes/mvme68k/xfer
@@ -3,79 +3,116 @@ Installation is supported from several media types, including:
 	FFS partitions
 	Tape
 	Remote NFS partitions
+	CD-ROM
 	FTP
 	HTTP
 
-The steps necessary to prepare the distribution sets
-for installation depend on which method of installation
-you choose.  The various methods are explained below.
-
-To prepare for installing via an NFS partition:
-
-	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
-	OpenBSD on.  This will probably require modifying the
-	/etc/exports file of the NFS server and resetting
-	mountd, acts which will require superuser privileges.
-	Note the numeric IP address of the NFS server and of
-	the router closest to the the new OpenBSD machine,
-	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.
-
-To prepare for installing via FTP:
-
-	NOTE: this method of installation is recommended
-	      only for those already familiar with using
-	      the BSD network-manipulation commands and
-	      interfaces.  If you aren't, this documentation
-	      should help, but is not intended to be
-	      all-encompassing.
-
-	The preparations for this method of installation
-	are easy: all you have to do is make sure that
-	there's some FTP site from which you can retrieve
-	the OpenBSD installation when it's time to do
-	the install.  You should know the numeric IP
-	address of that site, the numeric IP address of
-	your nearest router if one is necessary
-
-	Once you have done this, you can proceed to the next
-	step in the installation process, preparing your
-	system for OpenBSD installation.
-
-To prepare for installing via a tape:
-
-	To install OpenBSD from a tape, you need to somehow
-	get the OpenBSD filesets you wish to install on
-	your system on to the appropriate kind of tape,
-	in tar format.
-
-	If you're making the tape on a UN*X system, the easiest
-	way to do so is:
-
-		tar cvf <tape_device> <files>
-
-	where "<tape_device>" is the name of the tape device
-	that describes the tape drive you're using (possibly
-	something like /dev/nrst0, but we make no guarantees 8-).
-	Under SunOS 5.x, this would be something like /dev/rmt/0mbn.
-	Again, your mileage may vary.  If you can't figure it out,
-	ask your system administrator.  "<files>" are the names
-	of the "set_name.nnn" files which you want to be placed
-	on the tape.
-
-	Once you have done this, you can proceed to the next
-	step in the installation process, preparing your 
-	system for OpenBSD installation.
+The steps necessary to prepare the distribution sets for installation
+depend on which method of installation you choose.  The various methods
+are explained below.
+
+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.
+
+
+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.
+
+
+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 or by mounting
+	the CD-ROM containing the release.  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
+		dd if=stboot of=${tape} obs=512
+		dd if=bootst of=${tape} obs=512
+		dd if=bsd.rd of=${tape} obs=8k conv=sync
+	fi
+	for file in base etc comp game man misc xbase xfont xshare
+	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/MACHINE
+	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/MACHINE
+	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 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.