Document the installation floppies, as well as the fact that floppy images

can be used as poor man's miniroot.

5 files changed, 137 insertions, 144 deletions

diff --git a/distrib/notes/sparc64/contents b/distrib/notes/sparc64/contents
index 397d929befd..2f31580e352 100644
--- a/distrib/notes/sparc64/contents
+++ b/distrib/notes/sparc64/contents
@@ -7,9 +7,23 @@ dnl				an existing OpenBSD, NetBSD, Linux or Solaris
 dnl				installation to allow installing or upgrading
 dnl				to OpenBSD OSREV
 dnl
-dnl XXX uncomment when floppy available
-dnl OpenBSDfloppy
-dnl
+OpenBSDfloppy
+				This floppy image will boot on SBus-based
+				MACHINE models, such as:
+				- Ultra 1
+				- Ultra 2 (not tested)
+
+		floppyB{:--:}OSrev.fs	Another MACHINE boot and installation floppy;
+				see below.
+				This floppy image will boot on PCI-based
+				MACHINE models, such as:
+				- Ultra 5
+				- Ultra 10
+dnl XXX remove the following lines once floppyB is working
+				IMPORTANT! Please note that, as the moment of
+				writing, this floppy image is not working
+				correctly; your mileage may vary.
+
 OpenBSDdistsets
 
 OpenBSDbsd
@@ -29,9 +43,8 @@ requiring a pre-existing working operating system.
 
 The kernel and boot images are provided for net booting installations.
 
-dnl XXX uncomment when floppy available
-dnl OpenBSDfloppydesc(single,The)
-dnl
+OpenBSDfloppydesc(two,Each,s)
+
 DistributionDescription(six)
 
 OpenBSDbase(25.0,73.6,shared)
diff --git a/distrib/notes/sparc64/hardware b/distrib/notes/sparc64/hardware
index 1066453a8c3..1c7203a61a2 100644
--- a/distrib/notes/sparc64/hardware
+++ b/distrib/notes/sparc64/hardware
@@ -45,7 +45,7 @@ Supported devices {:-include-:}:
 Hardware the we do NOT currently support, but get many questions about:
 	Multiprocessor machines
 	Audio drivers
-	Floppy driver
+	Floppy driver (except for booting)
 	FFB (Creator), PGX and AFB (Elite 3D) framebuffers
         SBus ZX framebuffer (aka Leo)
 	other PCI and SBus cards have not been tested yet.
diff --git a/distrib/notes/sparc64/install b/distrib/notes/sparc64/install
index 47fc450d43d..437963eb675 100644
--- a/distrib/notes/sparc64/install
+++ b/distrib/notes/sparc64/install
@@ -1,20 +1,18 @@
 OpenBSDInstallPrelude
 
-dnl XXX uncomment and alter once there is floppy, cdrom or miniroot
+dnl XXX uncomment and alter once there is cdrom or miniroot
 dnl XXX available.
 dnl There are several ways to install OpenBSD onto a disk. The easiest way
 dnl in terms of preliminary setup is to use the OpenBSD miniroot that can
 dnl be booted off your local disk's swap partition.   The normal way is to
 dnl use the OpenBSD installation floppy.
-dnl
-dnl If your Sparc is hooked up in a network and you can find a server to
-dnl arrange for a diskless setup, which is a convenient way to install on a
-dnl machine whose disk does not currently hold a usable operating system.
-dnl This is difficult to get set up correctly the first time, but easy to
-dnl use afterwards.  (see ``Installing using a diskless setup'' below).
-Currently, the only way to install OpenBSD/MACHINE is to use a diskless
-setup, which is a convenient way to install on a machine whose disk does
-not currently hold a usable operating system.
+There are several ways to install OpenBSD onto a disk. The easiest way
+in terms of preliminary setup is to use the OpenBSD installation
+floppy.
+
+If your machine is hooked up in a network and you can find a server to
+arrange for a diskless setup, which is a convenient way to install on a
+machine whose disk does not currently hold a usable operating system.
 This is difficult to get set up correctly the first time, but easy to
 use afterwards.  (see ``Installing using a diskless setup'' below).
 
@@ -35,14 +33,14 @@ After taking care of all that, bring your system down gracefully using
 the shutdown(8) and/or halt(8) commands.  This will get you to the monitor
 prompt.
 
-dnl XXX no floppy available yet
-dnl Booting from Floppy Disk installation media:
-dnl
-dnl        ok boot floppy bsd
-dnl
-dnl This will cause the kernel contained in the floppy to be booted.
-dnl
-dnl
+
+Booting from Floppy Disk installation media:
+
+       ok boot floppy bsd
+
+This will cause the kernel contained in the floppy to be booted.
+
+
 dnl XXX no cdrom release yet
 dnl Booting From CD-ROM installation media:
 dnl 
@@ -57,18 +55,24 @@ dnl
 dnl
 dnl XXX no miniroot filesystem yet
 dnl Booting from disk (miniroot or floppy image):
-dnl
+dnl When miniroot available replace occurences of ``floppy image''
+dnl with ``miniroot'' since these instructions are primarily intended
+dnl for miniroot installation.
+Booting from disk (using the floppy image):
+
 dnl Boot the miniroot by typing the appropriate command at the PROM:
-dnl
-dnl	ok boot disk:b bsd
-dnl
+Boot the floppy image by typing the appropriate command at the PROM:
+
+	ok boot disk:b bsd
+
 dnl If you've loaded the miniroot onto some other disk than the default
-dnl drive 0, modify the boot specifier accordingly, keeping in mind the
-dnl drive vs. scsi-id shuffling and partition a=0, b=1... 
-dnl
-dnl	ok boot disk1:b bsd     # example - scsi target 1 or
-dnl				# second ide drive
-dnl
+If you've loaded the floppy image onto some other disk than the default
+drive 0, modify the boot specifier accordingly, keeping in mind the
+partition naming a=0, b=1... 
+
+	ok boot disk1:b bsd     # example - scsi target 1 or
+				# second ide drive
+
 
 Installing using a diskless setup:
 
@@ -88,36 +92,27 @@ command at the monitor prompt:
 
 dnl XXX Update title when installation media becomes available.
 dnl Installing using the Floppy, CD-ROM, miniroot or netboot procedure:
-Installing using the netboot procedure:
+Installing using the Floppy or netboot procedure:
 
 OpenBSDInstallPart2
 
 	Boot your machine from the installation media as described above.
 
-dnl XXX restore paragraph when floppy available
-dnl	It will take a while to load the kernel especially from a floppy
-dnl	or slow network connection, most likely more than a minute.  If
-dnl	some action doesn't eventually happen, or the spinning cursor has
-dnl	stopped and nothing further has happened, either your boot media
-dnl	is bad, your diskless setup isn't correct, or you may have
-dnl	a hardware or configuration problem.
-	It will take a while to load the kernel especially from a slow
-	network connection, most likely more than a minute.  If some
-	action doesn't eventually happen, or the spinning cursor has
+	It will take a while to load the kernel especially from a floppy
+	or slow network connection, most likely more than a minute.  If
+	some action doesn't eventually happen, or the spinning cursor has
 	stopped and nothing further has happened, either your boot media
 	is bad, your diskless setup isn't correct, or you may have
 	a hardware or configuration problem.
 
 OpenBSDBootMsgs
 
-dnl XXX Uncomment when floppy boot available
-dnl	While booting, you will probably see several warnings.  You
-dnl	may be warned that the kernel can't figure out what device
-dnl	it booted from.  Do not be alarmed, this is completely normal.
-dnl	This warning occurs because while OpenBSD/MACHINE can boot from
-dnl	the floppy drive, the kernel itself lacks a floppy driver for some
-dnl	MACHINE models.
-dnl
+	While booting, you will probably see several warnings.  You
+	may be warned that the kernel can't figure out what device
+	it booted from.  Do not be alarmed, this is completely normal.
+	This warning occurs because while OpenBSD/MACHINE can boot from
+	the floppy drive, the kernel itself lacks a floppy driver.
+
 	You will next be asked for your terminal type.  If you are
 	installing from a keyboard/monitor console, the default of
 	"sun" if correct.  If you are installing from a serial console
diff --git a/distrib/notes/sparc64/upgrade b/distrib/notes/sparc64/upgrade
index 4627e855088..085f269744d 100644
--- a/distrib/notes/sparc64/upgrade
+++ b/distrib/notes/sparc64/upgrade
@@ -3,6 +3,6 @@ are not expected.
 If you have been using an old OpenBSD/MACHINE snapshot, you can follow the
 following instructions.
 
-dnl XXX replace when floppy disk available
+dnl XXX uncomment once miniroot available
 dnl OpenBSDUpgrade({:-the miniroot, or the installation floppy-:})
-OpenBSDUpgrade({:-the miniroot-:})
+OpenBSDUpgrade({:-the installation floppy-:})
diff --git a/distrib/notes/sparc64/xfer b/distrib/notes/sparc64/xfer
index b0e72679f04..a4e0909cb09 100644
--- a/distrib/notes/sparc64/xfer
+++ b/distrib/notes/sparc64/xfer
@@ -26,93 +26,79 @@ dnl from one of the FTP mirrors over the internet, you may wish to transfer
 dnl the sets to a local FTP or NFS server, or copy them to a partition on
 dnl the target system's disk.
 
-dnl XXX uncomment when floppy available
-dnl OpenBSDXferFloppyFromDOS
-dnl
-dnl OpenBSDXferFloppyFromUnix
-dnl
-dnl XXX uncomment when floppy or miniroot available
-dnl XXX make sure to adapt text, especially examples, if only floppy
-dnl XXX or miniroot is available, but not both.
-dnl Creating a bootable hard disk using SunOS or other Un*x-like system:
-dnl 
-dnl 	If you don't have a floppy drive you can copy the floppy
+OpenBSDXferFloppyFromDOS
+
+OpenBSDXferFloppyFromUnix
+
+dnl XXX make sure to adapt text, especially examples, once miniroot
+dnl is available as well.
+Creating a bootable hard disk using SunOS or other Un*x-like system:
+
+dnl	If you don't have a floppy drive you can copy the floppy
 dnl 	installation image "floppy{:--:}OSrev.fs" or the mini-root "miniroot{:--:}OSrev.fs"
 dnl 	onto the hard disk you intend to boot on.  Traditionally, the
 dnl 	way to do this is to use dd(1) to place the bootable filesystem
 dnl 	image in the "swap" partition of the disk (while running in
 dnl 	single user mode), and then booting from that partition.
-dnl 
-dnl 	Using the "b" partition allows you to boot without overwriting
-dnl 	any useful parts of the disk, you can also use another partition,
-dnl 	but don't used the "a" or "c" partition without understanding
-dnl 	the disklabel issues described below under "incompatible systems".
-dnl 
-dnl 	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
-dnl 	which have a compatible view of SunOS disk labels and partitions.
-dnl 
-dnl 	Use the dd(1) utility to copy the file to the hard drive.
-dnl 	Under SunOS, the command would be:
-dnl 
-dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
+	If you don't have a floppy drive you can copy the floppy
+	installation image "floppy{:--:}OSrev.fs" onto the hard disk
+	you intend to boot on.  Traditionally, the way to do this is
+	to use dd(1) to place the bootable filesystem image in the
+	"swap" partition of the disk (while running in single user
+	mode), and then booting from that partition.
+
+	Using the "b" partition allows you to boot without overwriting
+	any useful parts of the disk, you can also use another partition,
+	but don't used the "a" or "c" partition without understanding
+	the disklabel issues described below under "incompatible systems".
+
+	This requires that you be running SunOS, Solaris, OpenBSD or NetBSD
+	which have a compatible view of SunOS disk labels and partitions.
+
+	Use the dd(1) utility to copy the file to the hard drive.
+	Under SunOS, the command would be:
+
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsd0b bs=36b
 dnl 				- or -
 dnl 		dd if=miniroot{:--:}OSrev.fs of=/dev/rsd0b bs=36b
-dnl 
-dnl 	The blocksize is arbitrary as long as it's a multiple of 512-bytes
-dnl 	and within the maximum supported by the driver, i.e. bs=126b may
-dnl 	not work for all cases.  Again, device/partition names may vary,
-dnl 	depending on the OS involved.
-dnl 
-dnl 	If you are preparing the hard drive on an incompatible system or
-dnl 	don't care about the hard disk contents, you can also install the
-dnl 	bootable image starting at the beginning of the disk. This lets
-dnl 	you prepare a bootable hard-drive even if don't have a working
-dnl 	operating system on your Sparc, but it important to understand
-dnl 	that the bootable image installed this way includes a "disk label"
-dnl 	which can wipe out any pre-existing disklabels or partitioning for
-dnl 	the drive.
-dnl 
-dnl 	The floppy image is used only for booting, and can be placed in
-dnl 	a partition that will be overwritten during the install process,
-dnl 	since it actually runs off a ram-disk image in the kernel.  In
-dnl 	contrast the miniroot is a normal unix root filesystem and you
-dnl 	must place in a partition that will not be overwritten until you've
-dnl 	completed the installation process.
-dnl 
-dnl 	To copy the floppy image to the whole disk, overwriting labels:
-dnl 
-dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-dnl 
-dnl 	Two notes - X should be replaced by the unit number of the target
-dnl 	disk, which is most likely *not* the disk/partition that's your
-dnl 	current root partition.  Again names may vary depending on the
-dnl 	OS involved.  Second, after doing this, the disklabel will be one
-dnl 	that would be appropriate for a floppy, i.e. one partition of 2880
-dnl 	block, and you'll probably want to change that later on.
-dnl 
-dnl 	If you're starting with a virgin disk and trying to do this under
-dnl 	SunOS, use format(8) and newfs(8) to set up the partitions and
-dnl 	mark the intended partition as an normal partition type.  If you're
-dnl 	using OpenBSD, perhaps on another architecture, OpenBSD will
-dnl 	create a "fictitious label" that will let you access the whole
-dnl 	disk.
-dnl 
-dnl 	To copy the floppy image to the hard disk, preserving SunOS,
-dnl 	Solaris, NetBSD or OpenBSD labels:
-dnl 
-dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
-dnl 
-dnl 	You need to be sure that your version of dd(1) supports the
-dnl 	skip and seek operands, otherwise you can try a technique like:
-dnl 
-dnl 		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
-dnl 		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
-dnl 		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
-dnl 
-dnl 	In either case, you've created a situation where the disklabel
-dnl 	and the filesystem information don't agree about the partition
-dnl 	size and geometry, however the results will be usable.
-dnl 
+
+	The blocksize is arbitrary as long as it's a multiple of 512-bytes
+	and within the maximum supported by the driver, i.e. bs=126b may
+	not work for all cases.  Again, device/partition names may vary,
+	depending on the OS involved.
+
+	If you are preparing the hard drive on an incompatible system or
+	don't care about the hard disk contents, you can also install the
+	bootable image starting at the beginning of the disk. This lets
+	you prepare a bootable hard-drive even if don't have a working
+	operating system on your machine, but it important to understand
+	that the bootable image installed this way includes a "disk label"
+	which can wipe out any pre-existing disklabels or partitioning for
+	the drive.
+
+	If you're starting with a virgin disk and trying to do this under
+	SunOS, use format(8) and newfs(8) to set up the partitions and
+	mark the intended partition as an normal partition type.  If you're
+	using OpenBSD, perhaps on another architecture, OpenBSD will
+	create a "fictitious label" that will let you access the whole
+	disk.
+
+	To copy the floppy image to the hard disk, preserving SunOS,
+	Solaris, NetBSD or OpenBSD labels:
+
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=1b skip=1 seek=1
+
+	You need to be sure that your version of dd(1) supports the
+	skip and seek operands, otherwise you can try a technique like:
+
+		dd if=/dev/rsdXc of=/tmp/label bs=1b count=1
+		dd if=floppy{:--:}OSrev.fs of=/dev/rsdXc bs=36b
+		dd if=/tmp/label of=/dev/rsdXc bs=1b count=1
+
+	In either case, you've created a situation where the disklabel
+	and the filesystem information don't agree about the partition
+	size and geometry, however the results will be usable.
+
 Creating a network bootable setup using SunOS or other Un*x-like system:
 
 	The details of setting up a network bootable environment vary
@@ -130,14 +116,13 @@ Creating a network bootable setup using SunOS or other Un*x-like system:
 
 OpenBSDXferPrelude
 
-dnl XXX uncomment when floppy available
-dnl The floppy installation allows installing OpenBSD directly from FTP
-dnl mirror sites over the internet, however you must consider the speed and
-dnl reliability of your internet connection for this option.  It may save
-dnl much time and frustration to use ftp get/reget to transfer the
-dnl distribution sets to a local server or disk and perform the installation
-dnl from there, rather than directly from the internet.
-dnl 
+The floppy installation allows installing OpenBSD directly from FTP
+mirror sites over the internet, however you must consider the speed and
+reliability of your internet connection for this option.  It may save
+much time and frustration to use ftp get/reget to transfer the
+distribution sets to a local server or disk and perform the installation
+from there, rather than directly from the internet.
+
 
 OpenBSDXferBareTape