Rearrange, move ARCS stuff to the preparation section (needs to grow with

more information), describe the installation process better, fix some typos,
mention NFS and tapes as valid installation media.

5 files changed, 91 insertions, 98 deletions

diff --git a/distrib/notes/sgi/contents b/distrib/notes/sgi/contents
index d99f477b63a..7d0495d4da5 100644
--- a/distrib/notes/sgi/contents
+++ b/distrib/notes/sgi/contents
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: contents,v 1.1 2004/08/20 17:53:09 pefo Exp $
+dnl	$OpenBSD: contents,v 1.2 2004/08/26 20:45:00 miod Exp $
 TopPart
 
 OpenBSDdistsets
@@ -30,5 +30,5 @@ OpenBSDxfont(33473489,40878080)
 dnl Do not list xserv, on purpose. No X11 support yet.
 dnl OpenBSDxserv(6682003,15800320)
 dnl
-dnl OpenBSDxshare(1660865,9687040)
+OpenBSDxshare(1660865,9687040)
 
diff --git a/distrib/notes/sgi/install b/distrib/notes/sgi/install
index 2925cf7e0e3..0709eedb48f 100644
--- a/distrib/notes/sgi/install
+++ b/distrib/notes/sgi/install
@@ -1,107 +1,68 @@
-dnl	$OpenBSD: install,v 1.3 2004/08/26 18:46:22 pefo Exp $
+dnl	$OpenBSD: install,v 1.4 2004/08/26 20:45:00 miod Exp $
 OpenBSDInstallPrelude
 
 There are several ways to install OpenBSD onto a disk. The easiest way
 in terms of preliminary setup is to use the OpenBSD ramdisk kernel that
 can be booted via BOOTP. Booting from CD is not yet supported.
 
+Booting over the network:
+dnl XXX provide more details!!!
 
-Installing using the OpenBSD ramdisk kernel.
+First, a bootp or dhcpd server needs to be set up. The bootpd(8) or
+dhcpd(8) manual page on your server should provide detailed information
+on how to set up the server.
 
-The ramdisk kernel is a self-contained OpenBSD filesystem including all
-utilities necessary to install OpenBSD on a local disk, embedded in a
-GENERIC kernel image. It is distributed as a plain ELF executable file
-designed to be loaded into the system by the ARCS firmware.
+The bootp or dhcp server needs to know the ethernet address of the
+system. This address can be found by using the ``printenv'' command
+in the Maintenance Console, looking for the ``eaddr'' variable.
 
-Booting the ramdisk kernel can be done from the ARCS graphic console
-although it might be more convenient to use the serial console since
-the kernel currently only supports the serial console. Some systems
-come with the serial console but enabled by default but sometimes this
-must be changed.
+The server should also provide a tftp location, where the bsd.rd file
+should be available.
 
-To change to serial console, go into the ARCS Maintenance console. When
-the system starts up, press the ESC key or use the the mouse and click
-the STOP FOR MAINTENANCE button. Once in the System maintenance meny,
-select '5' to go into the Command monitor. If the installed disk does
-not contain a valid Volume Header and is bootable the Maintenance
-console will be entered by default.
+Once the server is set up, boot with the following command in the
+Maintenance Console:
 
-It may be necessary to do a reset of the environment to its default setting
-by entering the command:
+> boot bootp()/bsd.rd
 
-> resetenv
 
+Installing the system:
 
-To switch the console to serial mode, change the console environment
-variable:
+OpenBSDInstallPart2
 
-> setenv console d
+	Boot your machine from the installation media as described above.
 
-and reboot the system. A serial console at 9600B8N1 and no flow control
-should be attached to the serial port marked (1).
+	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 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.
 
-If changing back to the graphics console is required do:
+OpenBSDBootMsgs
 
-> setenv console g
+	You will next be asked for your terminal type.
+dnl XXX needs extra text here once graphics console is available
+	Just hit return to select the default (vt100).
 
-After reboot, when the message:
-        To perform system maintenance instead, press <Esc>
-is displayed, press the ESCAPE key to get into maintenance mode. Again,
-select '5' to get to the Command monitor.
+OpenBSDInstallPart3
 
-When setting up the system to boot from disk, one environment variable
-needs to be changed. Set 'OSLoader' to 'boot'. By default it is set to
-'sash' which is the IRIX stand alone shell and loader. It may be convenient
-to do this setup now so the system will diskboot once the 'reboot' command
-is entered after the installation is complete.
+OpenBSDInstallPart4
 
-To be able to boot, a bootp/dhcpd server needs to be set up. See the dhcpd(8)
-man page for information on how to set up the dhcp server to respond to
-a bootp client. The dhcp server needs to know the ethernet address of the
-system. This address can be found by using the 'printenv' command and looking
-for the 'eaddr' variable.
-
-Loading the ramdisk kernel into your system is done with the appropriate
-ARCS boot command on Your system. Usually this is done by typing in the
-following string at the ARCS prompt:
-
-	bootp()/bsd.rd
-
-to boot from Your TFTP server.
-
-This will cause the ramdisk kernel to be booted. After the initial probe
-messages you'll will see the question:
-
-TBD.
-
-The script will do most of the work of transferring the system from the
-tar files onto your disk. You will frequently be asked for confirmation
-before the script proceeds with each phase of the installation process.
-Occasionally, you'll have to provide a piece of information such as the
-name of the disk you want to install on or IP addresses and domain names
-you want to assign.
-
-The installation script goes through the following phases:
-
-	- determination of the disk to install OpenBSD on
-	- checking of the OpenBSD partition information on the disk
-	- creating and mounting the OpenBSD filesystems
-	- setup of IP configuration
-	- extraction of the distribution tar files
-	- installation of kernel and the bootable kernel
-
-The installation program will guide you through the installation.
+OpenBSDInstallPart5(sd0)
 
+OpenBSDInstallNet({:-CD-ROM, NFS, -:})
 
 OpenBSDFTPInstall
 
 OpenBSDHTTPInstall
 
+OpenBSDTAPEInstall
+
 OpenBSDCDROMInstall
 
 OpenBSDNFSInstall
 
-OpenBSDCommonFS
+OpenBSDCommonFS(NFS)
 
 OpenBSDCommonURL
 
diff --git a/distrib/notes/sgi/prep b/distrib/notes/sgi/prep
index 94274763c49..b312e8a429d 100644
--- a/distrib/notes/sgi/prep
+++ b/distrib/notes/sgi/prep
@@ -1,19 +1,48 @@
-Before you start you should familiarize yourself with the ARCS setup
-and how to run programs from the Command monitor prompt.
-
-If you're installing OpenBSD/sgi for the first time it's a very good
-idea to look at the partition sizes of disk you intend installing OpenBSD on.
-Changing the size of partitions after you've installed is difficult. If
-you do not have a spare bootable disk, it may be simpler to re-install
-OpenBSD again from scratch.
-
-Assuming a classic partition scheme with root (`/') and /usr filesystems,
-a comfortable size for the OpenBSD root filesystem partition (a) is about
-64Mb. The install will take ~30Mb of that. However it has shown that 256M
-is not a bad choice when more packages are to be installed. A good initial
-size for the swap (b) partition is twice the amount of physical memory in
-your machine or at least 128M. A minimum /usr partition (e) is ~256M but
-with that you will likely run into trouble later. A minimum size of 1G is
-recommended. A full binary installation, without X11 or any other additional
-software, takes about 170M in `/usr'.
+dnl	$OpenBSD: prep,v 1.2 2004/08/26 20:45:00 miod Exp $
+Before you install your system, you should familiarize yourself with the
+ARCS setup and how to run programs from the Command monitor prompt.
 
+Accessing the Maintenance Console:
+
+    When the system starts up, press the ESC key or use the the mouse
+    and click the ``stop for maintenance'' button. Once in the System
+    Maintenance menu, select '5' (or click the appropriate icon if in
+    graphics console) to go into the Command Monitor.
+
+    If the internal disk with the lowest SCSI ID does not contain a
+    valid Volume Header, but is bootable, the Maintenance Console will
+    be entered by default.
+
+    The first time the Maintenance Console is entered, it may be
+    necessary to force a reset of the environment to its default
+    settings by entering the ``resetenv'' command and the chevron
+    prompt.
+
+Switching from serial to graphics console and vice versa:
+
+    Booting the ramdisk kernel can be done from the ARCS graphic console
+    although it might be more convenient to use the serial console since
+    the kernel currently only supports the serial console. Some systems
+    come with the serial console but enabled by default but sometimes
+    this must be changed.
+
+    To change to serial console, go into the ARCS Maintenance Console
+    and change the ``console'' environment variable, and power-cycle
+    the machine.
+
+    > setenv console d
+
+    will select 9600 8N1, no flow control, serial console on the first
+    serial port (labeled ``(1)''), while
+
+    > setenv console g
+
+    will select the graphics console.
+
+Setting the environment:
+
+    When setting up the system to boot from disk, the ``OSLoader''
+    environment variable will need to be changed.
+
+    Its default value is ``sash'', which is IRIX' standalone
+    shell and loader. Set it to ``boot'', the OpenBSD boot loader.
diff --git a/distrib/notes/sgi/upgrade b/distrib/notes/sgi/upgrade
index 7416937a263..27a2c80b0ae 100644
--- a/distrib/notes/sgi/upgrade
+++ b/distrib/notes/sgi/upgrade
@@ -1,2 +1,3 @@
-Because this is the first release of OpenBSD for the SGI - there is no
-upgrade option in this release.
+dnl	$OpenBSD: upgrade,v 1.2 2004/08/26 20:45:00 miod Exp $
+Since OpenBSD/OSREV is the first MACHINE release, there is no upgrade
+functionality.
diff --git a/distrib/notes/sgi/xfer b/distrib/notes/sgi/xfer
index 16f342952b0..1423e67b08b 100644
--- a/distrib/notes/sgi/xfer
+++ b/distrib/notes/sgi/xfer
@@ -1,15 +1,17 @@
-dnl	$OpenBSD: xfer,v 1.1 2004/08/20 17:53:09 pefo Exp $
+dnl	$OpenBSD: xfer,v 1.2 2004/08/26 20:45:00 miod Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
 	FFS partitions
+	Tape
+	Remote NFS partition
 	FTP
 	HTTP
 
-
 OpenBSDXferShortPrelude
 
-
 OpenBSDXferBareTape
 
+OpenBSDXferNFS
+
 OpenBSDXferFFS