Major update to powerpc specific distribution notes.

Minor tweaking may be necessary but this is the mass of the change.

5 files changed, 126 insertions, 83 deletions

diff --git a/distrib/notes/powerpc/contents b/distrib/notes/powerpc/contents
index 5b71cd150b4..47dd8bad775 100644
--- a/distrib/notes/powerpc/contents
+++ b/distrib/notes/powerpc/contents
@@ -88,12 +88,8 @@ words		(show methods of items at current location in the device tree)
 
 
 NOTES:
-	The powerpc port does not currently support sharing the disk with MacOS
-	This is an important fact on the iMac which does not support more than
-	one disk.
-
-	The powerpc port does not currently support booting from the Zip drive,
-	if installed.
+	The powerpc port does not currently support booting from a USB
+	Zip drive, if installed.
 
 	To reset a Power Macintosh to the factory-configure Open Firmware
 	settings, simultaneously hold down the Command, Option, P, R keys
@@ -102,23 +98,23 @@ NOTES:
 
 DistributionDescription
 
-OpenBSDbase(23.8M,71.4M)
+OpenBSDbase(23.4M,70.8M)
 
-OpenBSDcomp(19.1M,65.5M)
+OpenBSDcomp(19.7M,68.0M)
 
-OpenBSDetc(1.0M,3.3M)
+OpenBSDetc(1.0M,3.5M)
 
-OpenBSDgame(2.7M,6.3M)
+OpenBSDgame(2.7M,6.4M)
 
-OpenBSDman(5.2M,19.5M)
+OpenBSDman(5.4M,20.9M)
 
-OpenBSDmisc(5.6M,5.6M)
+OpenBSDmisc(1.6M,5.7M)
 
-OpenBSDxbase(4.4M,12.1M)
+OpenBSDxbase(7.2M,12.1M)
 
-OpenBSDxshare(1.5M,8.1M)
+OpenBSDxshare(1.7M,8.1M)
 
-OpenBSDxfont(6.2M,7.3M)
+OpenBSDxfont(11.6M,7.3M)
 
-OpenBSDxserv(2.1M,5.4M)
+OpenBSDxserv(4.4M,5.4M)
 
diff --git a/distrib/notes/powerpc/hardware b/distrib/notes/powerpc/hardware
index 825713f3fba..67ec4818916 100644
--- a/distrib/notes/powerpc/hardware
+++ b/distrib/notes/powerpc/hardware
@@ -1,19 +1,20 @@
 OpenBSD/MACHINE OSREV runs on iMac, G4 Power Macintosh, G4 Cube as well
-as possibly some other G3 Macintosh systems.  Older ADB-based systems
-will not work, only USB keyboard is supported.
+As PowerBook and iBook machines.
 
-Has been tested on iMac Rev A/233MHz and Rev C/333MHz machines, several
+Machines with older firmware: 6xxx, 7xxx 8xxx, and 9xxx machines are
+not supported.  PowerMac G3 Beige and B&W G3 are unknown. 
+
+Has been tested on iMac Revs A-C as well as on iMac DV(+) machines, several
 Power Macintosh G4 systems (single and dual processor), as well as the
-G4 Cube.  Some success has been reported on a PowerBook, however this
-is not well supported.
+G4 Cube. For portables, PowerBook G3, PowerBook G4 have been tested,
+iBook minimally tested.  Note that power saving features on portables
+are very limited, no power managment features are available, suspend/sleep
+is not supported.
 
-Some code has been written to work better on the B&W G3, but has never
-been retested.  Hardware availability is currently limiting development on
-these systems.
 
 Supported devices {:-include-:}:
 
-	IDE hard disk controllers. iMac/G4 onboard supported.
+	IDE hard disk controllers. onboard controllers supported.
 	SCSI host adapters:
 		Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
 
@@ -25,21 +26,25 @@ Supported devices {:-include-:}:
 	Ethernet adapters:
 		Digital DC21x4x-based PCI Ethernet adapters, including:
 			Znyx ZX34X
-		Onboard iMac 10-100Mbs Ethernet, 100Mbs untested.
-		Onboard G4 (gm) ethernet.
+		Onboard Older iMac 10-100Mbs (bm) Ethernet. 
+		Onboard G4/Powerbook/Newer iMac (gm) ethernet.
 
 	Tape drives:
 		SCSI Tape drives
 
 	CD-ROM drives:
 		SCSI CD-ROM drives
+		SCSI CD-RW drives
 		Atapi CD-ROM drives
+		Atapi DVD-ROM drives
+		Atapi DVD-RAM drives (read-only)
+		Atapi CD-RW drives.
 
 	Mice:
 		USB Mice.
 
 	Sound Cards:
-		NONE
+		AWACS supported, but not enabled due to performance issue.
 
 	Miscellaneous:
 		USB Hubs.
diff --git a/distrib/notes/powerpc/install b/distrib/notes/powerpc/install
index e8c8106d08d..4849406ac90 100644
--- a/distrib/notes/powerpc/install
+++ b/distrib/notes/powerpc/install
@@ -23,13 +23,16 @@ 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.
 
-	At this time the system can be installed from the supplied
-	CD boot image or by network loading the bootloader.  Once
+	At this time, the system can be installed from the supplied
+	CD boot image, by network loading the bootloader or loading
+	the bootloader and kernel from a HFS partition.  Once
 	the bootloader is installed on the local hard drive, the
-	system can boot from it.  Although currently OpenBSD
-	cannot share the same drive as Mac OS due to partitioning
-	issues, systems that support more than one physical drive
-	can dual boot using Open Firmware commands.
+	system can boot from it. OpenBSD may share a drive with MacOS
+	if the process is followed carefully. Currently it is
+	necessary to use OpenFirmware commands to dual boot between
+	OS's, or multiple drives may be used with each OS owning drive(s).
+	Note that on many of the systems is it not possible to
+	automatically boot OpenBSD at this time.
 
 	(Refer to "OpenBSD OSREV Release Contents" above for information
 	on how to access and boot from Open Firmware)
@@ -37,7 +40,7 @@ process again from scratch.
 	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" and the geometry will be printed on a line that
+	"wd0" or "sd0" 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's partitions.  You will
 	also need to know the name, to tell the install tools what
@@ -51,25 +54,89 @@ process again from scratch.
 	completely normal.  When you reach the prompt asking you for a
 	shell name, just hit return.
 
-	You will be presented with a welcome message and a prompt.  At
-	this time you should enter the command "install" to start the
-	installation process.
+	Now you will be asked whether you wish to do an "install"
+	or an "upgrade".  Enter 'i' for a fresh install or 'u' to
+	upgrade an existing installation.
 
-	You will be asked which terminal type to use, vt100 will work
-	almost acceptably, however no terminal type quite works correctly)
+	You will be presented with a welcome message and asked if
+	you really wish to install (or upgrade).  Assuming you
+	answered yes, you will be asked which terminal type to use.
+	You should just hit return to select the default (vt220).
 
 	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 "wd0" for IDE drives.  Reply
-	with the name of your disk. 
+	name of the disk is typically "wd0" for IDE/ATA drives or
+	"sd0" for SCSI drives.  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.  If there are any existing
 	partitions defined (for any operating system), and a disk label
 	is not found, you will first be given an opportunity to run
-	fdisk and create an OpenBSD partition.
-
-	If fdisk is being invoked on your behalf, it will start by
+	fdisk (MBR paritioned disk) or pdisk (HFS paritioned disk)
+	and create an OpenBSD partition.
+
+	If pdisk is being invoked, It will issue a prompt which will
+	allow one to delete the Unused parition, then using the "C"
+	command create a new parition. It is necessary to display
+	the parition table, either before deleting the free parition
+	or after, to know the start and size of the partition.
+
+	An example Parition map:The parition map may look like the following
+	Before editing the table, it looks like:
+
+	 #:                type name             length   base    ( size )
+	 1: Apple_partition_map Apple                63 @ 1      
+	 2:      Apple_Driver43*Macintosh            54 @ 64     
+	 3:      Apple_Driver43*Macintosh            74 @ 118    
+	 4:    Apple_Driver_ATA*Macintosh            54 @ 192    
+	 5:    Apple_Driver_ATA*Macintosh            74 @ 246    
+	 6:      Apple_FWDriver Macintosh           200 @ 320    
+	 7:  Apple_Driver_IOKit Macintosh           512 @ 520    
+	 8:       Apple_Patches Patch Partition     512 @ 1032   
+	 9:           Apple_HFS untitled        2142310 @ 1544    (  1.0G)
+	10:           Apple_HFS untitled 2      4120589 @ 2143854 (  2.0G)
+	11:              Unused untitled 3      6330517 @ 6264443 (  3.0G)
+
+	After editing the table, it should look like:
+	 #:                type name             length   base    ( size )
+	 1: Apple_partition_map Apple                63 @ 1      
+	 2:      Apple_Driver43*Macintosh            54 @ 64     
+	 3:      Apple_Driver43*Macintosh            74 @ 118    
+	 4:    Apple_Driver_ATA*Macintosh            54 @ 192    
+	 5:    Apple_Driver_ATA*Macintosh            74 @ 246    
+	 6:      Apple_FWDriver Macintosh           200 @ 320    
+	 7:  Apple_Driver_IOKit Macintosh           512 @ 520    
+	 8:       Apple_Patches Patch Partition     512 @ 1032   
+	 9:           Apple_HFS untitled        2142310 @ 1544    (  1.0G)
+	10:           Apple_HFS untitled 2      4120589 @ 2143854 (  2.0G)
+	11:             OpenBSD OpenBSD         6330517 @ 6264443 (  3.0G)
+
+	This will likely be different based on the number of paritions
+	created on the disk by the Apple partition editor.
+	It is _VERY_ important to not change the start or sizes of paritions
+	other than the ones that are to be used by OpenBSD, including
+	the Apple_Driver.* and Apple_partition_map.
+
+	---
+	Command (? for help): p
+	<output is in the before example above>
+	Command (? for help): d 11
+	Command (? for help): C
+	First block: 6264443
+	Length in blocks: 6330517
+	Name of partition: OpenBSD
+	Type of partition: OpenBSD
+	Command (? for help): p
+	<output is in the after example above>
+	---
+
+	After the parition is deleted, if the parition is printed,
+	it will show up as:
+	...
+	11:          Apple_Free Extra           6330517 @ 6264443 (  3.0G)
+	...
+
+	If fdisk is being invoked, it will start by
 	displaying the current partitions defined and then allow you
 	to modify this information, add new partitions and change
 	which partition to boot from by default.  If you make a mistake,
@@ -149,7 +216,7 @@ process again from scratch.
 
 	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
+	are several install methods supported; FTP, HTTP, tape, CD-ROM
 	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
@@ -164,8 +231,6 @@ OpenBSDTAPEInstall
 
 OpenBSDCDROMInstall
 		
-OpenBSDNFSInstall
-
 OpenBSDDISKInstall(,,{:- or MS-DOS-:})
 		
 OpenBSDCommonFS
diff --git a/distrib/notes/powerpc/prep b/distrib/notes/powerpc/prep
index 4c9e7f6a601..6befb73ae3a 100644
--- a/distrib/notes/powerpc/prep
+++ b/distrib/notes/powerpc/prep
@@ -1,2 +1,11 @@
-The MACHINE 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.
+OpenBSD/MACHINE is now capable of booting either from a dedicated
+disk using a MBR partitioned disk or sharing a disk with MacOS.
+
+If the disk is to be shared between MacOS and OpenBSD, it is necessary
+to reformat and install the MacOS partitions first, using the MacOS tools,
+leaving space on the disk as an "Unused" partition or as another partition
+that is reused for OpenBSD.
+
+For dedicated disks, MACHINE 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/xfer b/distrib/notes/powerpc/xfer
index 62ee0989899..a7902e50aea 100644
--- a/distrib/notes/powerpc/xfer
+++ b/distrib/notes/powerpc/xfer
@@ -2,11 +2,10 @@ Installation is supported from several media types, including:
 
 	CDROM
 	FFS partitions
+	HFS partitions (bootloader only, in conjuction with FTP/HTTP/tape)
 	Tape
-	Remote NFS partition
 	FTP
 	HTTP
-	rsh & restore
 
 Unless the machine already has openbsd installed on it, and
 the bootloader can be loaded from local disk the bootloader will
@@ -56,37 +55,6 @@ following:
 	your hard disk, below.  If you're upgrading an existing
 	installation, go directly to the section on upgrading.
 
-To install or upgrade 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