Mention use of PXE to get install kernel, and cleanup some whitespace.

ok miod@, deraadt@

2 files changed, 54 insertions, 23 deletions

diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index 6ecd40f88fb..393a934e205 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: install,v 1.4 2004/03/17 09:25:09 jmc Exp $
+dnl	$OpenBSD: install,v 1.5 2004/03/23 10:16:55 tom Exp $
 OpenBSDInstallPrelude
 
 If OpenBSD will be sharing the disk with another operating system,
@@ -14,25 +14,35 @@ that use the translated geometry.
 There are several ways to install OpenBSD onto a disk.  The easiest way,
 should your computer support it, is to boot off the OpenBSD CD-ROM, or
 off the bootable CD-ROM mini image. Otherwise, you can boot from a 3.5"
-1.44MB floppy disk if your machine has a floppy drive.
+1.44MB floppy disk if your machine has a floppy drive.  If your machine
+supports PXE network boots, you could try to configure a server for a
+network install.
 
 OpenBSDInstallPart2
 
-	With either the CD-ROM or the floppy in the drive, reboot your
-	computer. You might have to play with your BIOS options to let the
-	computer boot from the installation media, rather than the hard
-	disk.
-
-	It will take a while to load the kernel from a floppy or slow
-	speed CD-ROM drive, 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 floppy
-	is bad or you are having hardware problems. If trying another
-	floppy disk doesn't help, try booting after disabling your CPU's
-	internal and external caches (if any).  If it still doesn't work,
-	OpenBSD probably can't be run on your hardware.  This can probably
-	be considered a bug, so you might want to report it.
-	If you do, please {:-include-:} as many details about your system
+	If you are using CD-ROM or floppy media, ensure the disk is in
+	the drive before starting.
+
+	Reboot the computer to begin the install.  You might have to play
+	with your BIOS options to get the computer to boot from the
+	correct installation media (floppy, CD, or network/PXE) rather
+	than from the hard disk.
+
+	If you are installing across the network with PXE, you will need
+	to tell pxeboot to get the bsd.rd install kernel:
+
+	    boot> boot bsd.rd
+
+	It can take a while to load the kernel from a floppy, slow speed
+	CD-ROM drive, or across a network, 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
+	floppy is bad or you are having hardware problems. If trying
+	another floppy disk doesn't help, try booting after disabling your
+	CPU's internal and external caches (if any).  If it still doesn't
+	work, OpenBSD probably can't be run on your hardware.  This can
+	probably be considered a bug, so you might want to report it.  If
+	you do, please {:-include-:} as many details about your system
 	configuration as you can.
 
 OpenBSDBootMsgs
@@ -42,15 +52,15 @@ OpenBSDBootMsgs
 
 dnl Replace the following paragraph...
 	After entering the terminal type you will be asked whether you
-        wish to do an "(I)nstall".  Enter 'I' for a fresh install.
+	wish to do an "(I)nstall".  Enter 'I' for a fresh install.
 
 	You will be presented with a welcome message and asked if
-        you really wish to install.  Assuming you answered 'yes', the
+	you really wish to install.  Assuming you answered 'yes', the
 	install program will then tell you which disks of that type
 	it can install on, and ask you which it should use.
 	The name of the disk is typically "sd0" for SCSI drives or
 	"wd0" for IDE/RLL/ESDI/ST506 drives.
-        Reply with the name of your disk.
+	Reply with the name of your disk.
 dnl with this:
 dnl OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
 dnl once upgrades are available
diff --git a/distrib/notes/amd64/xfer b/distrib/notes/amd64/xfer
index c138be5c4a6..d30d486c390 100644
--- a/distrib/notes/amd64/xfer
+++ b/distrib/notes/amd64/xfer
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: xfer,v 1.3 2004/03/08 22:31:28 miod Exp $
+dnl	$OpenBSD: xfer,v 1.4 2004/03/23 10:16:56 tom Exp $
 Installation is supported from several media types, including:
 
 	CD-ROM
@@ -10,13 +10,34 @@ dnl	Remote NFS partition
 	FTP
 	HTTP
 
-If you can't (or don't want to) boot off a CD-ROM, you'll need to have
-a floppy disk (1.44MB required).
+If you can't (or don't want to) boot off a CD-ROM, you can use a floppy
+disk (1.44MB required).  Failing that, if your computer supports PXE, you
+can prepare a server to start the install across the network, but you will
+still need the install sets available on one of the above media types.
 
 OpenBSDXferFloppyFromDOS
 
 OpenBSDXferFloppyFromUNIX
 
+Creating a PXE network bootable setup using SunOS or other Un*x-like system:
+
+	In order to start the install via PXE, you will need to set up a
+	DHCP server and a TFTP server.  The details of how to do this
+	vary considerably, depending on the network's host.  You should
+	refer to the relevant man pages or administrator's guide for the
+	host system.
+
+	The DHCP server should return "pxeboot" to amd64 clients as the
+	network boot program.  Both pxeboot and the bsd.rd install kernel
+	should be copied to the TFTP server's root directory.
+
+	If you are using an OpenBSD server, you can use the supplied
+	dhcpd and tftpd.  A sample configuration for dhcpd is given in
+	the pxeboot(8) man page.  You can get it from the man{:--:}OSrev.tgz
+	distribution set, or see the copy on the OpenBSD web page.  You
+	should also refer to dhcpd(8) and tftpd(8) for more information
+	on configuring them.
+
 
 OpenBSDXferShortPrelude