First step towards proper bsd.rd documentation. Still lacks details in the

partitioning sequence for now.

6 files changed, 136 insertions, 259 deletions

diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index d43b988c980..23e580f4e40 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,20 +1,23 @@
-dnl	$OpenBSD: contents,v 1.44 2004/09/10 19:41:40 miod Exp $
+dnl	$OpenBSD: contents,v 1.45 2004/12/03 20:42:05 miod Exp $
 TopPart
 
 OpenBSDdistsets
 
-	bsd.tgz		The OpenBSD/MACHINE OSREV kernel binary. You MUST
-			install either this file or bsd-sbc.tgz below. It is
-			the kernel that you need to boot the system.
+OpenBSDbsd
 
-	bsd-sbc.tgz	Another OpenBSD/MACHINE OSREV kernel binary. This is
-			identical in every way to bsd.tgz except that it
-			enables a different SCSI driver which may allow some
-			otherwise incompatible SCSI disks to function with
-			OpenBSD/MACHINE.  You must install either this or
-			bsd.tgz.
+	bsdsbc		A slightly different GENERIC MACHINE kernel, using
+			a different SCSI driver for some MACHINE models, which
+			may allow some otherwise incompatible SCSI devices to
+			function with OpenBSD/MACHINE.
 
-	utils/		The MACHINE installation utilities for Mac OS.
+OpenBSDrd
+
+	bsdsbc.rd	A slightly different RAMDISK kernel, using
+			a different SCSI driver for some MACHINE models, which
+			may allow some otherwise incompatible SCSI devices to
+			function with OpenBSD/MACHINE.
+
+	utils/		The OpenBSD/MACHINE boot program for Mac OS.
 
 DistributionDescription(eleven)
 
@@ -40,24 +43,8 @@ OpenBSDxserv(494267,1145106)
 
 OpenBSDxshare(1937163,9969697)
 
-The directory '../OSREV/MACHINE/utils' contains a number of utilities for the
-Mac OS to aid the installation and configuration of OpenBSD.  The files are
-distributed in Macintosh BinHex format, which is used to make SEA (Self-
-Extracting Archive) files, which are then used to make the executables.  The
-files in this directory are as follows:
-
-	Booter1.11.3.sea.hqx
-		 This Mac OS program is used to load the OpenBSD kernel and
-		 start the operating system.  In all cases, you will need to
-		 download this file.
-
-	Installer_1.2.sea.hqx
-		 This is the Mac OS program used to install downloaded sets
-		 (such as those from the bins directory) onto a BSD partition.
-		 It is necessary in either the case of a fresh install or an
-		 upgrade.
-
-	Mkfs_1.45.sea.hqx
-		 A Mac OS program to build BSD filesystems on various
-		 partitions you have created (see below).  You will need this
-		 if you are performing a new installation.
+The directory '../OSREV/MACHINE/utils' contains the OpenBSD/MACHINE boot
+program, used to load the OpenBSD kernel. This program is distributed
+as a self-extracting archive in Macintosh BinHex format. If there is no
+BSD/Mac68k booter already installed on your Mac OS system, you will need to
+download this file.
diff --git a/distrib/notes/mac68k/hardware b/distrib/notes/mac68k/hardware
index a3efe4046d2..4093e882a1f 100644
--- a/distrib/notes/mac68k/hardware
+++ b/distrib/notes/mac68k/hardware
@@ -1,12 +1,12 @@
-dnl	$OpenBSD: hardware,v 1.20 2004/03/25 08:38:52 tom Exp $
+dnl	$OpenBSD: hardware,v 1.21 2004/12/03 20:42:05 miod Exp $
 OpenBSD/MACHINE OSREV runs on several of the older Macintosh computers.
-6MB of RAM should be sufficient to boot and a minimal system can probably
-be squeezed onto a 100MB partition by installing just the minimum sets.
+8MB of RAM should be sufficient to boot and a minimal system can probably
+be squeezed onto a 120MB partition by installing just the minimum sets.
 To actually do much compiling or anything more interesting than
 booting, more RAM and disk space is highly recommended. About 250MB will be
 necessary to install all of the OpenBSD OSREV binary distribution (note that
-this does not count swap space!).  Much more disk space is required to
-install the source and objects as well (about another 600MB).
+this does not count swap space!).
+
 A Mac OS partition is also required to install OpenBSD/MACHINE OSREV and boot it,
 see below.
 
@@ -32,37 +32,37 @@ machine.
 
 Supported devices on all of the above systems {:-include-:}:
 	Internal SCSI bus and most SCSI tapes, hard drives, and CD-ROM
-		drives
-	Internal sound--enough to beep on some machines, anyway
+	  drives
+	Internal sound -- enough to beep on some machines, anyway
 	Most NuBus video cards (there have been some
-		problems with some 24-bit color cards)
+	  problems with some 24-bit color cards)
 	Both internal serial ports
 	ADB keyboards and mice
 	Ethernet cards based on the Natl. Semiconductor 8390
-		(Asante, Apple, and a few others)
+	  (Asante, Apple, and a few others)
 	Some Ethernet cards based on the SONIC chip including internal
-		Ethernet on many of Apple's non-AV Quadras/Centrises and
-		PowerBook 500 series.
+	  Ethernet on many of Apple's non-AV Quadras/Centrises and
+	  PowerBook 500 series.
 	
 Some systems will boot and are usable from an external terminal
 (serial tty or SL/IP):
 	LC475, Performa 475, Quadra 605, Quadra 950
-	possibly others
+	Possibly others
 
 Some systems are reportedly almost supported:
 	LC/Performa575 (if 68LC040 replaced with a 68040)
 	LC/Performa630 (if 68LC040 replaced with a 68040, and booted from an
-		external SCSI drive)
+	  external SCSI drive)
 	PowerBook 550c (but the internal SCSI drive is not supported yet)
 
 What isn't supported, but often asked about:
 	PowerPC-based Macs.  Newer Mac PPC systems are supported by the
-		OpenBSD/macppc port.
+	  OpenBSD/macppc port.
+dnl XXX I think IIfx work now...
 	Machines based on Apple's IOP technology including the Mac IIfx.
 	Machines based on the 68LC040 processor.  Unfortunately, the chip
-		itself contains a major bug which is presently being worked
-		on.  However, machines such as the Centris 605 don't work
-		right now.
+	  itself contains a major bug for which no workaround is available
+	  in OpenBSD.
 	LCPDS Ethernet cards.
 	Apple Communication Slot (CS) Ethernet cards.
 	Quadra/Centris AV series' onboard MACE Ethernet.
diff --git a/distrib/notes/mac68k/install b/distrib/notes/mac68k/install
index 383697318b2..7ffe4451a3f 100644
--- a/distrib/notes/mac68k/install
+++ b/distrib/notes/mac68k/install
@@ -1,110 +1,50 @@
-dnl	$OpenBSD: install,v 1.28 2004/04/20 17:12:57 xsa Exp $
-OpenBSDInstallPrelude
+dnl	$OpenBSD: install,v 1.29 2004/12/03 20:42:05 miod Exp $
+OpenBSDInstallShortPrelude
 
-The installation can be broken down into four basic steps:
-	* Running Mkfs to build a filesystem or filesystems.
-	* Running Install Utility to load the files onto your filesystems.
-	* Running the booter to boot the system.
-	* Final system configuration.
-
-
-Preparing the filesystems:
-
-Double-click on the Mkfs application icon to start it up.  It will ask
-you for the SCSI ID of the drive that you are installing upon.  Once
-this is selected, it will present a list of the partitions on that disk.
-Select the partition on which you wish to build a filesystem and click
-on the "Format" button.  You will now be asked for a bunch of parameters
-for the hard drive and the filesystem.  Usually, you can just accept the
-defaults.  Note that although this dialog only has the "OK" button, you are
-not committed, yet.  Once you get the values you want, press the "OK"
-button. A dialog will be presented at this point with two options: "Format"
-and "Cancel." If you choose "Cancel," nothing will be written to your drive.
-If you choose "Format," the program will proceed to make a filesystem.
-
-Mkfs is not a well-behaved Mac OS application.  It will not allow
-any other tasks to run while it does (cooperative multitasking at its
-best).  When it's finished, the program will put up a dialog to ask if
-you have scanned the output for any error messages.  Usually there won't
-have been any errors, but do scan the output to make sure.  Simply click
-on the "I Read It" button and the program will quit.
-
-Repeat as necessary for any extra partitions that you wish to make
-filesystems on.  Note that you do _not_ need a filesystem on your swap
-partition.
-
-
-Installing the distribution sets:
-
-Double-click on the Install Utility icon to start it up.  The installer
-will present the same SCSI ID menu that mkfs did.  Select the same SCSI
-ID that you did for mkfs--i.e., the one you are installing onto.
-
-If you are installing onto a single root partition, proceed to the
-"Installing the base files" section, below.
-
-	If you have not created filesystems for the root, usr, and
-	any other partitions, go back to "Preparing the filesystem(s),"
-	above.
-
-	When you started the installer, it mounted your root partition.
-	Just before it printed, "Mounting partition 'A' as /," it printed
-	lines like:
-		sd1 at scsi ID 5.
-	This means that the device for SCSI ID 5 is sd1.  The partitions
-	are signified by a trailing letter.  For instance, sd1a would be
-	the root partition of the second SCSI disk in the chain, and sd0g
-	would be the first usr partition on the first SCSI disk.  It is
-	important to emphasize that device numbers after the 'sd' do not
-	correspond to SCSI IDs of disks but rather to logical disks.  The
-	lowest SCSI ID will always be sd0 proceeded by increasing ID
-	numbers.
-
-	You will need to know the proper device to mount the remaining
-	partition(s) by hand:
-
-		* Select "Build Devices" from the "File" menu.  This builds
-		  a minimal tree of device files on your filesystem in
-		  /dev.
-
-		* Select "Mini Shell" from the "File" menu.
-
-		* Mount the filesystems you wish with the command:
-			mount device path
-		  For example, if you wish to mount the second partition from
-		  the first SCSI disk, sd0, on /usr, you would type:
-			mount /dev/sd0b /usr
-
-		* Type "quit" to exit the minishell after you have mounted
-		  all the filesystems.
-
-
-Installation of base files:
-
-	Select the "Install" menu item from the "File" menu and install
-	base{:--:}OSrev.tgz, bsd.tgz, comp{:--:}OSrev.tgz, and any other
-	packages you wish to install at this time (see the contents section
-	for information about what's in each package).  The installer will
-	print out the filename of each file as it is installed and will
-	take quite some time to install everything.
-
-	As is the case with Mkfs, this is not a particularly well-behaved
-	Mac OS application and the machine will be completely tied up
-	while the installation takes place.
-
-	At some point after installing the base package, select the "Build
-	Devices" option from the "File" menu.  This will create a minimal
-	set of device nodes for you in /dev and your initial /etc/fstab.
-	The installer program also has an option to give you a mini-shell.
-
-
-Booting the system:
+OpenBSDInstallPart2
 
-Double-click on the BSD/Mac68k Booter icon to start the application.  Check
-that the options in the Booting dialog look sane--especially the SCSI ID.
-If not, correct them to your preference.  You will have to change the kernel
-name to "bsd".  When you are satisfied with your choices, try booting
-OpenBSD.
+	Double-click on the BSD/Mac68k Booter icon on the desktop to
+	start the application.  Go to the "Booting..." entry in the
+	"Options" menu, and make it point to the bsd.rd kernel on your
+	Mac OS filesystem. Then boot the kernel.
+
+OpenBSDBootMsgs
+
+	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).
+
+OpenBSDInstallPart3
+
+dnl XXX describe pdisk too
+OpenBSDInstallPart4
+
+dnl XXX same here.
+OpenBSDInstallPart5(sd0)
+
+OpenBSDInstallNet({:­CD-ROM, NFS, -:})
+
+OpenBSDFTPInstall
+
+OpenBSDHTTPInstall
+
+OpenBSDTAPEInstall
+
+OpenBSDCDROMInstall
+
+OpenBSDNFSInstall
+dnl Not supported
+dnl OpenBSDDISKInstall(,{:-only -:})
+
+OpenBSDCommonFS(NFS)
+
+OpenBSDCommonURL
+
+Once the installation is complete, reboot into Mac OS, and start the
+BSD/Mac68k Booter again. This time, point to the OpenBSD kernel location
+on its own partition. You will have to change the kernel name to "bsd"
+or "bsdsbc", depending which one you have installed. Be sure to check that
+the SCSI ID is correct as well.
 
 If you wish to save your preferences, choose the "Save Preferences"
 option in the "File" menu, then quit the application and restart.  Due
@@ -118,39 +58,4 @@ technology (i.e. Quadra 900, 950), make sure that the serial switch option
 in the Control Panel is set to "off". This allows OpenBSD to use the
 serial lines on these machines.
 
-Note that on a Mac68k, the generation of the DSA and RSA keys can take quite
-some time -- on a slower system, it may take an hour or more.
-Be patient.
-
-
-Final Configuration:
-
-Unlike other OpenBSD platforms, OpenBSD/MACHINE OSREV does not configure the
-network or set a root password as part of the installation process. The user
-will have to do this after the first OpenBSD boot.  Upon first boot, root
-will have no password, just hit RETURN when prompted. You will want to set
-the root password using the passwd(1) command.
-
-To generate all the available device nodes, cd to the /dev directory and run
-"./MAKEDEV all".
-
-To set up basic networking, you will need to create or edit the following
-files, all of which are in the /etc directory:
-	myname		the computer's name (with a fully-qualified
-			domain name).
-	mygate		the IP address of the default gateway.
-	hostname.if	configuration of the host adapter (the actual name
-			will be something like hostname.sn0 or hostname.ae0;
-			see your dmesg for your adapter name).
-	resolv.conf	name server configuration.
-	hosts		names and IP addresses of this machine and others on
-			the network.
-	dhclient.conf	dhcp client information.
-
-Once these files are configured, your system will be very much like any
-other OpenBSD system.  'mygate' and 'myname' are just single-line text
-files; for info on the others, see hostname.if(5), resolv.conf(5), hosts(5),
-and dhclient.conf(5) in the OpenBSD man pages.
-
-
 OpenBSDCongratulations
diff --git a/distrib/notes/mac68k/prep b/distrib/notes/mac68k/prep
index 3448dd172aa..4c8ef66de8b 100644
--- a/distrib/notes/mac68k/prep
+++ b/distrib/notes/mac68k/prep
@@ -1,6 +1,10 @@
-dnl	$OpenBSD: prep,v 1.14 2004/03/23 13:47:41 nick Exp $
-Find your favorite disk partitioning utility.  Some
-of the ones that have been tried and seem to work are:
+dnl	$OpenBSD: prep,v 1.15 2004/12/03 20:42:05 miod Exp $
+If your machine only has one SCSI disk, you will need to share the disk
+with Mac OS.  You might have to repartition and/or reinstall Mac OS in
+order to make room available for OpenBSD.
+
+Find your favorite disk partitioning utility.  Some of the ones that have
+been tried and seem to work are:
 	APS Powertools 2.7.3
 	SCSI Directory Lite
 	Disk Manager Mac from OnTrack
@@ -10,47 +14,42 @@ of the ones that have been tried and seem to work are:
 
 "HD SC Setup" is included with the supported versions of Mac OS.
 This utility ignores non-Apple hard disks unless you patch it with the
-application found at <http://www.euronet.nl/users/ernstoud/hdpatch.html>.
-
-** First, be sure you have a reliable backup of any data
-** which you may want to keep.  All information on the hard
-** drive you will be repartitioning will be lost.
-
-That done, use your favorite partitioning utility to make
-at least one A/UX "Root & Usr" partition and an A/UX "Swap"
-partition.  The "Root & Usr" partition should be _at least_
-250MB in size if you wish to install all the sets.  This partition
-will be the root partition of your OpenBSD system.
-
-Generally, you should allocate twice as much swap space as you have real
-memory (so, if you have 16MB of RAM, specify 32MB of swap space).
-Systems that will be heavily used or that are low on real
-memory should have more swap space allocated.  Systems that
-will be only lightly used can get away with less.
-
-If you like, you can also create a smaller root partition
-and a larger /usr.  If you plan to use this machine as a
-server, you may also want a separate /var.  Create these
-partitions as the BSD "usr" or "User slice X" type.
-
-It is also possible to use the Mkfs utility to "convert" partitions from
-Mac OS partitions to BSD partitions.  Mkfs will be discussed in more detail
-later, but it is also very possible to simply prepare your hard drive by
-partitioning it with Mac OS partitions of the correct size.  If you do this,
-simply select the "Convert" button when choosing partitions to build a
-filesystem on in Mkfs (see below).
-
-Before moving on, you should make sure that your machine is running the correct
-software on the Mac OS side.  In the Memory control panel, you should turn
-Virtual Memory off whenever you are planning to use the BSD/Mac68k Booter.
-You should also make sure that your machine is using 32-bit addressing.  If
-there is no "Addressing:" option in your Memory control panel and your
+application found at the following URL:
+  http://www.euronet.nl/users/ernstoud/hdpatch.html
+Alternatively, one might prefer to use the A/UX version which does not
+have such a restriction, and can be found at the following URL:
+  http://www.euronet.nl/users/ernstoud/hdsetup.html
+
+Prior to attempting to repartition your disk, everything of value on the
+drive should be backed up.  All information on the drive you will be
+repartitioning will be lost.
+
+That done, use your favorite partitioning utility and make any necessary
+Mac OS partitions, then restore your data.
+
+You might want to create your OpenBSD partitions at this time, rather than
+with the "pdisk" utility during the installation itself. In this case,
+create one "A/UX Root" partition (for the / filesystem), one "Swap"
+partition (for swap, obviously), and as many "Usr file system" or
+"Unreserved" partitions as you want (for the other filesystems, such as
+/tmp, /usr, /var, etc).
+
+You will also need to install the BSD/Mac68k Booter on your Mac OS
+system. It is available in the utils/ subdirectory of the distribution,
+in self-extracting and binhex form as booter.sea.hqx.
+Extract it as you would for any other Macintosh application.
+
+Before moving on, you should make sure that your machine is running the
+correct software on the Mac OS side.  In the Memory control panel, you
+should turn Virtual Memory off whenever you are planning to use the
+BSD/Mac68k Booter.
+
+You should also make sure that your machine is using 32-bit addressing.
+If there is no "Addressing:" option in your Memory control panel and your
 machine is supported, you will probably need Mode32.  Mode32 is a control
-panel and extension combination which enables 32-bit addressing on older Macs
-which do not use it by default.  This program is available from any Info-Mac
-mirror.  Finally, we recommend strongly that, at least for the purposes of
-setting the system up, you run with the machine's monitor in 1-bit ("Black
-and White" in the monitor's control panel) mode.
+panel and extension combination which enables 32-bit addressing on older
+Macs which do not use it by default.  This program is available from any
+Info-Mac mirror.
 
 All of that done and accounted for, you are now set to install OpenBSD on
 your hard drive.
diff --git a/distrib/notes/mac68k/upgrade b/distrib/notes/mac68k/upgrade
index 259637a65e4..fdd30e66ae6 100644
--- a/distrib/notes/mac68k/upgrade
+++ b/distrib/notes/mac68k/upgrade
@@ -1,13 +1,2 @@
-To upgrade to OpenBSD OSREV from a previous version, you should follow the
-instructions on installing the system, beginning with using the MacBSD
-Install Utility.  All you need do is copy each of the distribution sets in
-over your current system from the Mac OS.
-
-However, you should not copy the etc{:--:}OSrev.tgz file into the system.
-Instead, download it while running OpenBSD and put it in /tmp or some other
-harmless place and unpack it with a command like 'tar zxvf etc{:--:}OSrev.tgz'.
-You will then have an etc directory with current system configuration files
-in it.  Use this to carefully upgrade your files in the running /etc and
-reboot the system.  Also, it is highly recommended that when upgrading your
-kernel binary (/bsd) you back up the old, working kernel and extract
-bsd.tgz into / only from OpenBSD.
+dnl	$OpenBSD: upgrade,v 1.15 2004/12/03 20:42:05 miod Exp $
+OpenBSDUpgrade({:- the bsd.rd kernel-:})
diff --git a/distrib/notes/mac68k/xfer b/distrib/notes/mac68k/xfer
index 0b85248d50c..1fc5fe13959 100644
--- a/distrib/notes/mac68k/xfer
+++ b/distrib/notes/mac68k/xfer
@@ -1,17 +1,14 @@
-dnl	$OpenBSD: xfer,v 1.16 2004/03/17 09:25:09 jmc Exp $
-Installation is really only supported from the local Macintosh hard drive or
-from an AppleShare volume.  This means that you'll need at least enough room
-on the HFS partition or AppleShare volume for the largest file that you will
-have to install.
+dnl	$OpenBSD: xfer,v 1.17 2004/12/03 20:42:05 miod Exp $
+Installation is supported from several media types, including:
 
-You will also need to collect the following Mac OS tools:
-	Mkfs,
-	BSD Install Utility, and
-	BSD/Mac68k Booter.
+	CD-ROM
+	Tape
+	Remote NFS partition
+	FTP
+	HTTP
 
-These three are compacted and in binhex form as mkfs.hqx,
-installer.hqx, and booter.sea.hqx, respectively.
+OpenBSDXferShortPrelude
 
-Extract them as you would any other Macintosh applications.  The
-source code for these utilities should be in the same directory with the
-word "src" somewhere in the filename.
+OpenBSDXferBareTape
+
+OpenBSDXferNFS