Reflect reality better

1 files changed, 50 insertions, 53 deletions

diff --git a/distrib/notes/amiga/upgrade b/distrib/notes/amiga/upgrade
index 17841e376d8..4cdf3f858f1 100644
--- a/distrib/notes/amiga/upgrade
+++ b/distrib/notes/amiga/upgrade
@@ -2,15 +2,15 @@ The upgrade to OpenBSD 2.1 is a binary upgrade; it would be prohibitive
 to make users upgrade by compiling and installing the 2.1 sources, and
 it would be very difficult to even compile a set of instructions that
 allowed them to do so.
-installing.
-
-To do the upgrade, you must have the OpenBSD kernel on AmigaDOS and
-you must transfer the upgrade filesystem upgr-21.fs onto the swap
-partition of the OpenBSD hard disk.  You must also have at least the
-"base21" 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,
+
+To do the upgrade, and if you are using the miniroot installation, you
+must have the OpenBSD kernel on AmigaDOS and you must transfer the root
+filesystem miniroot21.fs onto the swap partition of the OpenBSD hard disk.
+If you are using the ramdsik installation, the bsd.rd kernel is enough.
+You must also have at least the "base21" 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.
@@ -23,6 +23,11 @@ beginning the upgrade process.
 
 To upgrade your system, follow the following instructions:
 
+	If you know you need an -I option to loadbsd, you should add it
+	to the loadbsd invocation you'll use for the upgrade.
+
+	Miniroot installation:
+
 	Transfer the upgrade miniroot filesystem onto the hard disk
 	partition used by OpenBSD for swapping, as described in the
 	"Preparing your System for OpenBSD Installation" section above.
@@ -38,10 +43,29 @@ To upgrade your system, follow the following instructions:
 	swap partition.  When prompted for the root device, type
 	'sd0*' (replacing 0 with the disk number that OpenBSD used for
 	your root/swap device).  The '*' character indicates that the
-	root filesystem is contained on the swap partition.
+	root filesystem is contained on the swap partition.  Continue
+	reading below the ramdisk installation description:
+
+	Ramdisk installation:
+
+	Now boot up OpenBSD using the 2.1 kernel using the loadbsd
+	command:
+
+		loadbsd bsd.rd
+
+	You should see the screen clear and some information about
+	your system as the kernel configures the hardware.
+
+	Common instructions for both miniroot/ramdisk installations:
+
 	When you reach the prompt asking you for a shell name, just
 	hit return.
 
+	You will be asked which terminal type to use, you should just
+	hit return to select the default (vt220).
+
+	At the question whether to (I)nstall or (U)pgrade choose "U".
+
 	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
@@ -52,9 +76,11 @@ To upgrade your system, follow the following instructions:
 	However, if you hit it at an inopportune moment, your system
 	may be left in an inconsistent (and possibly unusable) state.
 
-	The upgrade program will then 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.)
+	The upgrade program will then chack & mount your root filesystem
+	under /mnt and grab some configuration info from it for the
+	continued upgrade process.  You'll be asked if the network
+	should be enabled at this point.  After that is done the rest
+	of the filesystems will be checked and mounted.
 
 	If you don't already have the OpenBSD distribution sets on your
 	disk, look in the installation section for information on how
@@ -67,54 +93,25 @@ To upgrade your system, follow the following instructions:
 	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 "base21" 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 base21" 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.
-
-	You will probably also want to copy the release "bsd" kernel
-	image to your root at some point.
-	
+	mounted, in the case of upgrading via NFS).
+
 Your system has now been upgraded to OpenBSD 2.1.
 
-	After a new kernel has been copied to your hard disk, your
-	machine is a complete OpenBSD 2.1 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.
+	After all this, your machine is a complete OpenBSD 2.1 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.
 
-	First, you will probably want to get the etc20 distribution,
+	First, you will probably want to get the etc21.tar.gz 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.
 
-	Second, 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".
+	Second, you might want to check your /dev against the new MAKEDEV
+	script found there, if you have changed the nodes locally.  The
+	upgrade process runs "sh MAKEDEV all" but that may not be enough
+	for your personal setup.
 
 	Third, you must deal with certain changes in the formats of
 	some of the configuration files.  The most notable change is