Update to 2.1 preparation instructions

1 files changed, 25 insertions, 27 deletions

diff --git a/distrib/notes/amiga/prep b/distrib/notes/amiga/prep
index 23fbdc81ec4..3ad6a19476f 100644
--- a/distrib/notes/amiga/prep
+++ b/distrib/notes/amiga/prep
@@ -84,41 +84,39 @@ Transferring the miniroot filesystem:
 	The OpenBSD/amiga installation or upgrade now uses a "miniroot"
 	fileystem which is installed on the partition used by OpenBSD
 	for swapping.  This removes the requirement of using a floppy
-	disk for the filesystem used by the installation or upgrade
+	disk for the filesystem used by the installation/upgrade
 	process.  It also allows more utilities to be present on the
 	filesystem than would be available when using an 880K floppy
 	disk.
 
-	Once the hard disk has been prepared for OpenBSD, the appropriate
-	miniroot filesystem (inst-21.fs for a new install or upgr-21.fs
-	for an upgrade) is transferred to the swap partition configured
-	during the hard disk prep (or the existing swap parition in
-	the case of an upgrade).  The xstreamtodev utility provided in
-	the "amiga/utilities" directory can be used on AmigaDOS to
-	transfer the filesystem for either a new installation or an
-	upgrade.  The filesystem can also be transferred on an existing
-	OpenBSD system for an update by using dd.  This should only be
-	done after booting OpenBSD into single-user state.  It may also
-	be possible to shutdown to single-user, providing that the
-	single-user state processes are not using the swap partition.
+	Once the hard disk has been prepared for OpenBSD, the miniroot
+	filesystem (miniroot21.fs) is transferred to the swap partition
+	configured during the hard disk prep (or the existing swap
+	partition in the case of an upgrade).  The xstreamtodev utility
+	provided in the "amiga/utilities" directory can be used on
+	AmigaDOS to transfer the filesystem for either a new installation
+	or an upgrade.  The filesystem can also be transferred on an
+	existing OpenBSD (or NetBSD) system for an update by using dd.
+	This should only be done after booting the former OS into single-
+	user state.  It may also be possible to shutdown to single-user,
+	providing that the single-user state processes are not using the
+	swap partition.
 
 	On AmigaDOS, the command:
-		xstreamtodev --input=inst-21.fs --rdb-name=<swap partition>
+		xstreamtodev --input=miniroot21.fs --rdb-name=<swap partition>
 	where <swap partition> is the name you gave to the OpenBSD
-	partition to be used for swapping.  Use upgr-21.fs if you
-	are going to do an upgrade of an existing OpenBSD system.  If
-	xstreamtodev is unable to determine the SCSI driver device
-	name or the unit number of the specified partition, you may
-	also need to include the option "--device=<driver.name>" and/or
-	"--unit=<SCSI unit number>".
-
-	To transfer the miniroot using OpenBSD, you should be booted up
-	in single user state on the current OpenBSD system, or use the
+	partition to be used for swapping.  If xstreamtodev is unable to
+	determine the SCSI driver device name or the unit number of the
+	specified partition, you may also need to include the option
+	"--device=<driver.name>" and/or "--unit=<SCSI unit number>".
+
+	To transfer the miniroot using an older BSD, you should be booted
+	up in single user state on the current system, or use the
 	"shutdown now" command to shutdown to single-uyser state.  Then
 	copy the miniroot using dd:
-		dd if=upgr-21.fs of=/dev/rsd0b
-	where /dev/rsd0b should be the device path of the swap partition
+		dd if=miniroot21.fs of=/dev/rsdXb
+	where /dev/rsdXb should be the device path of the swap partition
 	your system is configured to use.  Once the file is copied,
-	reboot back to AmigaDOS to boot the upgrade kernel.  NOTE:  the
-	release kernel is a "generic" kernel, and requires that the
+	reboot back to AmigaDOS to boot the new OpenBSD kernel.  NOTE:
+	the release kernel is a "generic" kernel, and requires that the
 	swap partition be on the same device as the root partition.