fixes from miod:

- MOPS -> MOP
- .<arch> suffix is the exception, rather than the rule
- better fstab entries

1 files changed, 34 insertions, 11 deletions

diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 42491f6d442..41e9a0750bb 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: diskless.8,v 1.50 2006/05/19 10:39:15 jmc Exp $
+.\"	$OpenBSD: diskless.8,v 1.51 2006/05/19 13:02:06 jmc Exp $
 .\"	$NetBSD: diskless.8,v 1.7.4.1 1996/05/30 18:58:10 cgd Exp $
 .\"
 .\"
@@ -197,12 +197,11 @@ directory.
 .Pp
 If booting an HPPA64, Motorola, or Sun client,
 make a link such that the boot program is
-accessible by a file name composed of the client's IP address
-in HEX, a dot, and the architecture name (all upper case).
+accessible as a file named after the client's IP address in HEX.
 For example:
 .Bd -literal -offset indent
 # cd /tftpboot
-# ln -s boot.net C0C5600C.SUN4
+# ln -s boot.net C0C5600C
 .Ed
 .Pp
 The following example converts an IP address to hex:
@@ -211,11 +210,13 @@ $ echo 192.197.96.12 | awk -F . \e
 	'{ printf "%02X%02X%02X%02X\en", $1, $2, $3 ,$4 }'
 .Ed
 .Pp
-Some architectures, such as the Sun3 and Ultrasparc machines, do not append the
-architecture name.
-It this case, the name would be just C0C5600C.
-The name used is architecture dependent, it simply has to match what the
-booting client's PROM wishes it to be.
+Sun Sparc machines also require a
+.Dq . Ns Aq Ar arch
+suffix.
+So the filename in the example above for a Sun4 machine would be
+.Dq C0C5600C.SUN4 .
+The name used is really architecture dependent:
+it simply has to match what the booting client's PROM wishes it to be.
 If the client's PROM fails to fetch the expected file,
 .Xr tcpdump 8
 can be used to discover which filename the client is trying to read.
@@ -244,7 +245,7 @@ should ensure that the general purpose
 boot program is installed in the directory
 .Pa /usr/mdec/rbootd .
 .Pp
-Architectures using MOPS
+Architectures using MOP
 (Vax)
 should follow the instructions in
 .Xr mopd 8
@@ -318,7 +319,29 @@ the critical mount points in the client's
 .Bd -literal -offset indent
 myserver:/export/myclient/root / nfs rw 0 0
 myserver:/export/myclient/swap none swap sw,nfsmntpt=/swap
-myserver:/usr /usr nfs rw 0 0
+myserver:/export/myclient/root/usr /usr nfs rw,nodev 0 0
+myserver:/export/myclient/root/var /var nfs rw,nosuid,nodev 0 0
+.Ed
+.Pp
+The above example works even if
+.Pa /usr
+and
+.Pa /var
+are not on separate partitions.
+It allows them to be mounted with NFSv3,
+if the server allows it,
+and to specify per-partition mount options,
+such as
+.Dq nodev .
+.Pp
+If the
+.Pa /usr
+partition is to be shared between machines,
+as in the example
+.Pa /etc/exports
+above, a more suitable entry might be:
+.Bd -literal -offset indent
+myserver:/usr /usr nfs ro 0 0
 .Ed
 .It
 Make sure the correct processes are enabled on the server.