Update Install notes. Not finished but better.

7 files changed, 72 insertions, 240 deletions

diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index 11c87e4c1e1..053d7539161 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -13,8 +13,12 @@ As well you may be interested in
 		rawrite.exe, gzip.exe, and pfdisk.exe; see
 		installation section, below.
 
-In summary, there is one powerpc floppy image called "floppy.fs".  This
-is a bootable install floppy which can be used both to install and to
+Instead of the single floppy, currently multiple floppies for different
+systems exist. boot.fs is for VI vme board machines, bootmix.fs is for
+Motorola Powerstack (and possibly other machines) and bootofw.fs is
+generic and should run on any system with openfirmware because it only uses
+openfirmware for device drivers (not recommended for general use).
+This is a bootable install floppy which can be used both to install and to
 upgrade OpenBSD to the current version.  It is also useful for maintenance
 and disaster recovery.  In addition, the "tools/" directory contains some
 utilities that might be useful for the installation.
@@ -30,19 +34,19 @@ Bootable installation/upgrade floppy:
 
 DistributionDescription
 
-OpenBSDbase(12.5M,35.1M)
+OpenBSDbase(35.8M,89.0M)
 
-OpenBSDcomp(7.7M,24.2M)
+OpenBSDcomp(12.3M,40.4M)
 
-OpenBSDetc(92K,450K)
+OpenBSDetc(131K,620K)
 
-OpenBSDgame(2.8M,6.7M)
+OpenBSDgame(5.3M,12.2M)
 
-OpenBSDman(2.5M,9.6M)
+OpenBSDman(3.2M,12.1M)
 
-OpenBSDmisc(1.7M,6.1M)
+OpenBSDmisc(1.5M,5.4M)
 
-OpenBSDtext(1.0M,3.5M)
+OpenBSDtext(1.7M,5.4M)
 
 OpenBSDxbase
 
diff --git a/distrib/notes/powerpc/hardware b/distrib/notes/powerpc/hardware
index 732181c5a72..0c423f6be3d 100644
--- a/distrib/notes/powerpc/hardware
+++ b/distrib/notes/powerpc/hardware
@@ -6,33 +6,57 @@ Has been tested on various Motorola (MCG) boards:
 	Pro3000, Series E and Series DT.
 Also tested on a V-I Power-3 vme board.
 
+MCG 603 machines will not work with later firmware. A firmware
+incompatibility exists that has not yet been fixed. Some versions
+of earlier openfirmware work fine with 603 family machines.
+
 The minimal configuration is said to require 8M of RAM and 150M of
 disk space, though we do not know of anyone running with a system
 quite this minimal today.  To install the entire system requires much
 more disk space,
 
 Supported devices {:-include-:}:
-	ONLY DEVICES SUPPORTED BY OPENFIRMWARE ON THE MACHINE.
 
-	Floppy controllers.
-	IDE hard disk controllers. (if supported by ofw)
+	Floppy controllers. (only if running full ofw drivers)
+	IDE hard disk controllers. (only if running full ofw drivers)
 	SCSI host adapters: (if supported by ofw)
+		[OPENFIRMWARE SUPPORT]
 		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 		(ofw may support other scsi devices)
+		[NATIVE SUPPORT]
+		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 
 	VGA, SVGA Display Adapters. 
+		[OPENFIRMWARE SUPPORT]
 		X does not yet exist.  currently will only function as console
+		[NATIVE SUPPORT]
+		None
 
 	Serial ports:
+		[OPENFIRMWARE SUPPORT] (also MIX drivers)
 		Only port 0 on the machine is supported and only as console.
+		[NATIVE SUPPORT]
+		VI kernels supports com0 and com1 serial ports.
 
 	Ethernet adapters:
+		[OPENFIRMWARE SUPPORT]
 		Digital DC21x4x-based PCI Ethernet adapters, including:
 		Znyx ZX34X
 		(ofw may support other devices)
+		[NATIVE SUPPORT]
+		Digital DC21x4x-based PCI Ethernet adapters, including:
+		Znyx ZX34X
+		Znyx ZX314
+		Onboard ethernet for Powerstack family machines.
 	Tape drives:
+		[OPENFIRMWARE SUPPORT]
 		NONE
+		[NATIVE SUPPORT]
+		SCSI Tape drives
 	CD-ROM drives:
+		[OPENFIRMWARE SUPPORT]
+		SCSI CD-ROM drives (act ask harddrives).
+		[NATIVE SUPPORT]
 		SCSI CD-ROM drives
 	Mice:
 		NONE
diff --git a/distrib/notes/powerpc/install b/distrib/notes/powerpc/install
index 36dfd1d00af..ade45295efb 100644
--- a/distrib/notes/powerpc/install
+++ b/distrib/notes/powerpc/install
@@ -33,12 +33,21 @@ question.  If you wish to stop the installation, you may hit Control-C
 at any time, but if you do, you'll have to begin the installation
 process again from scratch.
 
-	Boot your machine using the floppy.fs floppy.  When
-	presented with the boot prompt hit return.  If the boot prompt
-	does not appear in a reasonable amount of time, you either
+	Determine which floppy image is appropriate for the system
+	being installed. VI vme boards should use boot.fs, MCG machines
+	should use bootmix.fs (bootmix.fs should work on VI computers too).
+	or If those do not work, try the bootofw.fs image.  Apple derived
+	hardware, Power Macintosh machines or clones are not supported.
+
+	Boot your machine using the appropriate floppy image.
+	This is done by entering the openfirmware command prompt
+	(possibly system specific mechanism) then booting the floppy
+	with the "boot floppy:\ofwboot" command.  When presented
+	with the boot prompt hit return.  If the boot prompt does
+	not appear in a reasonable amount of time, you either
 	have a bad boot floppy, a hardware problem, or an incompatible
 	OpenFirmware prom (some of these still exist).  Try writing the
-	floppy.fs floppy image to a different disk, and using that.
+	appropriate floppy image to a different disk, and using that.
 	If it still doesn't work, OpenBSD probably can't be run on your
 	hardware.  This can probably be considered a bug, so you might
 	want to report it.  If you do, please {:-include-:} as many details
@@ -61,6 +70,7 @@ process again from scratch.
 	disk to install on.  If you cannot read the messages as they
 	scroll by, do not worry -- you can get at this information
 	later inside the install program.
+	[openfirmware uses ofdiskX, typically 0 is floppy, 1 is scsi id0]
 
 	While booting, you will probably see several warnings.  You
 	should be warned that no swap space is present, and that
@@ -73,16 +83,20 @@ process again from scratch.
 	installation process.
 
 	You will be asked which terminal type to use, you should just
-	hit return to select the default (pc3).
+	hit return to select the default (ofw for vga under ofw drivers)
+	If installing via serial, set it appropriate for the terminal
+	emulator being used.
 
 	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" for SCSI drives.  Reply
-	with the name of your disk.  If you have a floppy drive on the
-	machine, it may be called "sd0", and then your first scsi disk
-	becomes "sd1".  It helps to watch the floppy drive light; this
-	will tell you if you have accidentally told it to access the
-	wrong drive.
+	with the name of your disk. 
+
+	[ofw note]
+	If you have a floppy drive on the machine it is [ofdisk0] and
+	then your first scsi disk becomes "ofdisk1".  It helps to
+	watch the floppy drive light; this will tell you if you
+	have accidentally told it to access the wrong drive.
 
 	Next you will have to edit or create a disklabel for the disk
 	OpenBSD is being installed on.  If there are any existing
diff --git a/distrib/notes/powerpc/prep b/distrib/notes/powerpc/prep
index a8faabd787d..f0c2a213212 100644
--- a/distrib/notes/powerpc/prep
+++ b/distrib/notes/powerpc/prep
@@ -1,19 +1,2 @@
-The powerpc port boots off a boot program in an MSDOS filesystem.  You
-need to start by making an MSDOS filesystem that the OpenFirmware will
-accept.
-
-Boot OpenFirmware on the machine intended to install the system on.
-it is necessary to prepare the disk that OpenBSD will be installed
-on in the following way:
-at the ok prompt type
-
-        1 fat-partition hdiskX
-
-where hdiskX is the hard drive intended for installation.  On some
-machines you need to use the name 'diskX' instead of 'hdiskX'.
-
-The boot program (/usr/mdec/ofwboot) will go into this filesystem
-(/msdos/ofwboot).
-
-Your hard disk is now prepared to have OpenBSD installed on it, and
-you should proceed with the installation instructions.
+The powerpc port boots off a boot program in an MSDOS filesystem. 
+This is now set up by the install program and no special setup is required.
diff --git a/distrib/notes/powerpc/upgrade b/distrib/notes/powerpc/upgrade
index 6dbfbf46d9d..e58beb82840 100644
--- a/distrib/notes/powerpc/upgrade
+++ b/distrib/notes/powerpc/upgrade
@@ -1,195 +1 @@
-NOTE!  If you are going to do the upgrade manually, you MUST use the
-"-r" flag when invoking disklabel(8).  You MUST also change the
-partition table such that partition 'c' encompasses the entire drive,
-and not only the OpenBSD partition.  Finally, partition 'd' is no
-longer special and can be used for any purpose whatsoever.
-
-Also, OpenBSD now uses partition ID 0xA6 (166 decimal), but will
-continue to work with 0xA5 for compatibility reasons.  However, if
-you change the partition ID to 0xA6, you will be able to share the
-disk with 386BSD, FreeBSD or NetBSD.  Note that the latter three can
-NOT easily share the disk with each others.
-
-To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr{:--:}OSrev.fs floppy image on another.  You must
-also have at least the "base{:--:}OSrev" binary distribution set available,
-so that you can upgrade with it, using one of the upgrade methods
-described above.  Finally, you must have sufficient disk space
-available to install the new binaries.  Since the old binaries are
-being overwritten in place, you only need space for the new binaries,
-which weren't previously on the system.  If you have a few megabytes
-free on each of your root and /usr partitions, you should have enough
-space.
-
-Since upgrading involves replacing the boot blocks on your OpenBSD
-partition, the kernel, and most of the system binaries, it has the
-potential to cause data loss.  You are strongly advised to BACK UP ANY
-IMPORTANT DATA ON YOUR DISK, whether on the OpenBSD partition or on
-another operating system's partition, before beginning the upgrade
-process.
-
-To upgrade your system, follow the following instructions:
-
-	Boot your machine using of the appropriate kernel-copy floppy.
-	When presented with the boot prompt (the prompt begins with
-	"Boot" and ends with ":-"), hit return.
-
-	You will be prompted to insert a file system floppy.  Remove
-	the kernel-copy floppy and insert the upgr{:--:}OSrev floppy, then hit
-	any key to continue booting.
-
-	While booting, you will probably see several warnings.  You
-	should be warned that no swap space is present, and that
-	init(8) cannot find /etc/rc.  Do not be alarmed, these are
-	completely normal.  When you reach the prompt asking you for a
-	shell name, just hit return.
-
-	You will be presented with some information about the upgrade
-	process and a warning message, and will be asked if you wish
-	to proceed with the upgrade process.  If you answer
-	negatively, the upgrade process will stop, and your disk will
-	not be modified.  If you answer affirmatively, the upgrade
-	process will begin, and your disk will be modified.  You may
-	hit Control-C to stop the upgrade process at any time.
-	However, if you hit it at an inopportune moment, your system
-	may be left in an inconsistent (and possibly unusable) state.
-
-	You may be asked if you wish to upgrade your file systems to
-	the new file system format.  If you do, reply affirmatively.
-	If you don't have your file systems upgraded now, you should
-	probably do it manually after the install process is complete,
-	by using "fsck -c 2". Read the fsck(8) manual page for more
-	details. Note that this step is only important when upgrading
-        from a pre-OpenBSD 1.0 release.
-
-	The upgrade program will then check your root file system,
-	and, if you approved, will upgrade it to the new file system
-	format.  It will then mount your root file system on /mnt.
-
-	If your file systems are being upgraded, the upgrade script
-	will copy the new fsck(8) program to your hard disk and
-	upgrade your remaining file systems.
-
-	The upgrade program will then automatically replace the boot
-	blocks on your disk with newer versions, and mount all of your
-	file systems under /mnt.  (In other words, your root partition
-	will be mounted on /mnt, your /usr partition on /mnt/usr, etc.)
-
-	If you don't already have the OpenBSD distribution sets on your
-	disk, look in the installation section for information on how
-	to transfer them to your disk.
-
-	If you have only one floppy drive, and don't have the disk
-	space to copy all of the distribution onto the hard drive, you
-	can do the following:
-
-		Install a kernel on the hard drive as detailed a few
-		paragraphs below, then boot off the hard drive.  Now
-		you can copy and install distribution sets
-		incrementally from your lone floppy drive.
-
-	Once the distribution sets are transferred to your disk,
-	continue here.  (Obviously, if the OpenBSD distribution sets
-	are already on your disk, because you've transferred them
-	before starting the upgrade process, you don't need to
-	transfer them again now!)
-
-	After the software has been transferred to the machine (or
-	mounted, in the case of upgrading via NFS), change into the
-	directory containing the "base{:--:}OSrev" distribution set.  Once you
-	are there, run the "Set_tmp_dir" command, and hit return at
-	the prompt to select the default answer for the temporary
-	directory's path name.  (It should be the path name of the
-	directory that you're in.)
-
-	Run the command "Extract base{:--:}OSrev" to upgrade the base
-	distribution.
-
-	Repeat the above two steps for all of the sets you wish to
-	upgrade.  (For each, change into the directory containing the
-	set, run "Set_tmp_dir" and accept the default path name, then
-	run the "Extract <setname>" command.)
-
-	If you were previously using the security distribution set,
-	you MUST upgrade to the new version, or you will not be able
-	to log in when the upgrade process is complete.  Similarly, if
-	you were not previously using the security set, you must NOT
-	upgrade to the new version.
-
-	When you are done upgrading all of the distribution sets you
-	wish to upgrade, issue the command "Cleanup".  It will clean
-	up the installation, by remaking some system databases.  When
-	it is complete, you should use "halt" to halt the system.
-
-	When the system is halted, remove the "upgr{:--:}OSrev" floppy from
-	the floppy drive, and replace it with the OpenBSD OSREV
-	kernel-copy floppy that you previously booted from. Reboot
-	with that floppy.
-
-	Once again, you will be prompted to insert a file system
-	floppy.  DO NOT replace the kernel-copy floppy, just hit any
-	key.
-
-	Again, While booting, you may see several warnings.  You may
-	be warned that no swap space is present, that init(8) cannot
-	find /etc/rc, and that one or more databases with names like
-	"pwd.db" cannot be found.  Do not be alarmed, as, again, these
-	are completely normal.  Hit return at the prompt asking you
-	for a shell name.
-
-	You will be presented with a shell prompt, at which you should
-	enter the "copy_kernel" command.  It will ask you what
-	partition to copy the kernel to, and you should reply with the
-	name of your root partition (e.g. sd0a or wd0a).
-
-	You will be asked if you are sure that you want to copy the
-	kernel.  Reply affirmatively, and it will check the file
-	system on your root partition, mount it, and copy the kernel.
-	Once the kernel is copied, you should use "halt" to halt the
-	system.
-
-	Once the system is halted, remove the kernel-copy floppy from
-	the floppy disk drive, and hit any key to reboot.
-
-Your system has now been upgraded to OpenBSD OSREV.
-
-        After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD OSREV system.  However, that
-	doesn't mean that you're finished with the upgrade process.
-	There are several things that you should do, or might have to
-	do, to insure that the system works properly.
-
-	Second, you will probably want to get the etc{:--:}OSrev distribution,
-	extract it, and compare its contents with those in your /etc/
-	directory.  You will probably want to replace some of your
-	system configuration files, or incorporate some of the changes
-	in the new versions into yours.
-
-	Third, you will probably want to update the set of device
-	nodes you have in /dev.  If you've changed the contents of
-	/dev by hand, you will need to be careful about this, but if
-	not, you can just cd into /dev, and run the command "sh
-	MAKEDEV all".
-
-	Fourth, you must deal with certain changes in the formats of
-	some of the configuration files.  The most notable change is
-	that the "options" given to many of the file systems in
-	/etc/fstab or by hand have changed, and some of the file
-	systems have changed names. *IMPORTANT*: ANY INSTANCES OF "ufs"
-        IN /etc/fstab MUST BE CHANGED TO "ffs".  To find out what the
-        new options are, it's suggested that you read the manual page
-        for the file systems' mount commands, for example mount_nfs(8)
-        for NFS.  (Note that the information for mounts of type "ffs",
-	i.e. Fast File Systems, are contained in the mount(8) man
-	page.)
-
-	Finally, you will want to delete old binaries that were part
-	of the version of OpenBSD that you upgraded from and have since
-	been removed from the OpenBSD distribution.  If you are
-        upgrading from a pre-1.0 OpenBSD, you might also
-	want to recompile any locally-built binaries, to take
-	advantage of the shared libraries.  (Note that any new
-	binaries that you build will be dynamically linked, and
-	therefore take advantage of the shared libraries, by default.
-	For information on how to make statically linked binaries,
-	see the cc(1) and ld(1) manual pages.)
+[Upgrades may not be well supported currently for the powerpc port]
diff --git a/distrib/notes/powerpc/whatis b/distrib/notes/powerpc/whatis
index cfa25c9954c..938c2d1a1a4 100644
--- a/distrib/notes/powerpc/whatis
+++ b/distrib/notes/powerpc/whatis
@@ -1,2 +1,2 @@
 For the powerpc, OpenBSD OSREV is a new release of our existing code.  This
-port is not completely reliable or fast.
+port is not completely reliable or fast, but is improving.
diff --git a/distrib/notes/powerpc/xfer b/distrib/notes/powerpc/xfer
index 453c93b80ce..320774a5761 100644
--- a/distrib/notes/powerpc/xfer
+++ b/distrib/notes/powerpc/xfer
@@ -1,6 +1,6 @@
 Installation is supported from several media types, including:
 
-	DOS partitions
+	CDROM
 	FFS partitions
 	Tape
 	Remote NFS partition
@@ -8,8 +8,9 @@ Installation is supported from several media types, including:
 	HTTP
 	rsh & restore
 
-No matter which installation medium you choose, you'll need to have
-a floppy disk (1.44Mb required).
+Unless it is possible to netboot the machine, you'll need to have
+a floppy disk (1.44Mb required). 
+
 
 If you are using a UN*X-like system to write the floppy image to
 disk, you should use the "dd" command to copy the file system image