[PATCH] nfs: Update Documentation/nfsroot.txt to include dhcp, syslinux and isolinux

* Document the ip command a little differently to make the
  interaction between defaults and autoconfiguration a little clearer
  (I hope)

* Update autoconfiguration the current set of options, including DHCP

* Update the boot methods to add syslinux and isolinux, and remove
  dd of=/dev/fd0 which is no longer supported by linux

* Add a referance to initramfs along side initrd.
  Should the latter and its document be removed some time soon?

* Various cleanups to put the text consistently into the thrid person

* Reformated a bit to fit into 80 columns a bit more nicely

* Should the bootloaders documentation be removed or split
  into a separate documentation, it seems somewhat out of scope

Signed-off-by: Horms <horms@verge.net.au>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 160 insertions, 115 deletions

diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt
index d56dc71d94..3cc953cb28 100644
--- a/Documentation/nfsroot.txt
+++ b/Documentation/nfsroot.txt
@@ -4,15 +4,16 @@ Mounting the root filesystem via NFS (nfsroot)
 Written 1996 by Gero Kuhlmann <gero@gkminix.han.de>
 Updated 1997 by Martin Mares <mj@atrey.karlin.mff.cuni.cz>
 Updated 2006 by Nico Schottelius <nico-kernel-nfsroot@schottelius.org>
+Updated 2006 by Horms <horms@verge.net.au>
 
 
 
-If you want to use a diskless system, as an X-terminal or printer
-server for example, you have to put your root filesystem onto a
-non-disk device. This can either be a ramdisk (see initrd.txt in
-this directory for further information) or a filesystem mounted
-via NFS. The following text describes on how to use NFS for the
-root filesystem. For the rest of this text 'client' means the
+In order to use a diskless system, such as an X-terminal or printer server
+for example, it is necessary for the root filesystem to be present on a
+non-disk device. This may be an initramfs (see Documentation/filesystems/
+ramfs-rootfs-initramfs.txt), a ramdisk (see Documenation/initrd.txt) or a
+filesystem mounted via NFS. The following text describes on how to use NFS
+for the root filesystem. For the rest of this text 'client' means the
 diskless system, and 'server' means the NFS server.
 
 
@@ -21,11 +22,13 @@ diskless system, and 'server' means the NFS server.
 1.) Enabling nfsroot capabilities
     -----------------------------
 
-In order to use nfsroot you have to select support for NFS during
-kernel configuration. Note that NFS cannot be loaded as a module
-in this case. The configuration script will then ask you whether
-you want to use nfsroot, and if yes what kind of auto configuration
-system you want to use. Selecting both BOOTP and RARP is safe.
+In order to use nfsroot, NFS client support needs to be selected as
+built-in during configuration. Once this has been selected, the nfsroot
+option will become available, which should also be selected.
+
+In the networking options, kernel level autoconfiguration can be selected,
+along with the types of autoconfiguration to support. Selecting all of
+DHCP, BOOTP and RARP is safe.
 
 
 
@@ -33,11 +36,10 @@ system you want to use. Selecting both BOOTP and RARP is safe.
 2.) Kernel command line
     -------------------
 
-When the kernel has been loaded by a boot loader (either by loadlin,
-LILO or a network boot program) it has to be told what root fs device
-to use, and where to find the server and the name of the directory
-on the server to mount as root. This can be established by a couple
-of kernel command line parameters:
+When the kernel has been loaded by a boot loader (see below) it needs to be
+told what root fs device to use. And in the case of nfsroot, where to find
+both the server and the name of the directory on the server to mount as root.
+This can be established using the following kernel command line parameters:
 
 
 root=/dev/nfs
@@ -49,23 +51,21 @@ root=/dev/nfs
 
 nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
 
-  If the `nfsroot' parameter is NOT given on the command line, the default
-  "/tftpboot/%s" will be used.
+  If the `nfsroot' parameter is NOT given on the command line,
+  the default "/tftpboot/%s" will be used.
 
-  <server-ip>   Specifies the IP address of the NFS server. If this field
-                is not given, the default address as determined by the
-                `ip' variable (see below) is used. One use of this
-                parameter is for example to allow using different servers
-                for RARP and NFS. Usually you can leave this blank.
+  <server-ip>   Specifies the IP address of the NFS server.
+                The default address is determined by the `ip' parameter
+                (see below). This parameter allows the use of different
+                servers for IP autoconfiguration and NFS.
 
-  <root-dir>    Name of the directory on the server to mount as root. If
-                there is a "%s" token in the string, the token will be
-                replaced by the ASCII-representation of the client's IP
-                address.
+  <root-dir>    Name of the directory on the server to mount as root.
+                If there is a "%s" token in the string, it will be
+                replaced by the ASCII-representation of the client's
+                IP address.
 
   <nfs-options> Standard NFS options. All options are separated by commas.
-                If the options field is not given, the following defaults
-                will be used:
+                The following defaults are used:
                         port            = as given by server portmap daemon
                         rsize           = 1024
                         wsize           = 1024
@@ -81,129 +81,174 @@ nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
 ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
 
   This parameter tells the kernel how to configure IP addresses of devices
-  and also how to set up the IP routing table. It was originally called `nfsaddrs',
-  but now the boot-time IP configuration works independently of NFS, so it
-  was renamed to `ip' and the old name remained as an alias for compatibility
-  reasons.
+  and also how to set up the IP routing table. It was originally called
+  `nfsaddrs', but now the boot-time IP configuration works independently of
+  NFS, so it was renamed to `ip' and the old name remained as an alias for
+  compatibility reasons.
 
   If this parameter is missing from the kernel command line, all fields are
   assumed to be empty, and the defaults mentioned below apply. In general
-  this means that the kernel tries to configure everything using both
-  RARP and BOOTP (depending on what has been enabled during kernel confi-
-  guration, and if both what protocol answer got in first).
+  this means that the kernel tries to configure everything using
+  autoconfiguration.
+
+  The <autoconf> parameter can appear alone as the value to the `ip'
+  parameter (without all the ':' characters before) in which case auto-
+  configuration is used.
+
+  <client-ip>   IP address of the client.
 
-  <client-ip>   IP address of the client. If empty, the address will either
-                be determined by RARP or BOOTP. What protocol is used de-
-                pends on what has been enabled during kernel configuration
-                and on the <autoconf> parameter. If this parameter is not
-                empty, neither RARP nor BOOTP will be used.
+                Default:  Determined using autoconfiguration.
 
   <server-ip>   IP address of the NFS server. If RARP is used to determine
                 the client address and this parameter is NOT empty only
-                replies from the specified server are accepted. To use
-                different RARP and NFS server, specify your RARP server
-                here (or leave it blank), and specify your NFS server in
-                the `nfsroot' parameter (see above). If this entry is blank
-                the address of the server is used which answered the RARP
-                or BOOTP request.
-
-  <gw-ip>       IP address of a gateway if the server is on a different
-                subnet. If this entry is empty no gateway is used and the
-                server is assumed to be on the local network, unless a
-                value has been received by BOOTP.
-
-  <netmask>     Netmask for local network interface. If this is empty,
+                replies from the specified server are accepted.
+
+                Only required for for NFS root. That is autoconfiguration
+                will not be triggered if it is missing and NFS root is not
+                in operation.
+
+                Default: Determined using autoconfiguration.
+                         The address of the autoconfiguration server is used.
+
+  <gw-ip>       IP address of a gateway if the server is on a different subnet.
+
+                Default: Determined using autoconfiguration.
+
+  <netmask>     Netmask for local network interface. If unspecified
                 the netmask is derived from the client IP address assuming
-                classful addressing, unless overridden in BOOTP reply.
+                classful addressing.
 
-  <hostname>    Name of the client. If empty, the client IP address is
-                used in ASCII notation, or the value received by BOOTP.
+                Default:  Determined using autoconfiguration.
 
-  <device>      Name of network device to use. If this is empty, all
-                devices are used for RARP and BOOTP requests, and the
-                first one we receive a reply on is configured. If you have
-                only one device, you can safely leave this blank.
+  <hostname>    Name of the client. May be supplied by autoconfiguration,
+                but its absence will not trigger autoconfiguration.
 
-  <autoconf>    Method to use for autoconfiguration. If this is either
-                'rarp' or 'bootp', the specified protocol is used.
-                If the value is 'both' or empty, both protocols are used
-                so far as they have been enabled during kernel configura-
-                tion. 'off' means no autoconfiguration.
+                Default: Client IP address is used in ASCII notation.
 
-  The <autoconf> parameter can appear alone as the value to the `ip'
-  parameter (without all the ':' characters before) in which case auto-
-  configuration is used.
+  <device>      Name of network device to use.
+
+                Default: If the host only has one device, it is used.
+                         Otherwise the device is determined using
+                         autoconfiguration. This is done by sending
+                         autoconfiguration requests out of all devices,
+                         and using the device that received the first reply.
 
+  <autoconf>    Method to use for autoconfiguration. In the case of options
+                which specify multiple autoconfiguration protocols,
+                requests are sent using all protocols, and the first one
+                to reply is used.