diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/nfsroot.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index 9b956a969362..c86dd38e2281 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt | |||
@@ -97,10 +97,6 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
97 | autoconfiguration will take place. The most common way to use this | 97 | autoconfiguration will take place. The most common way to use this |
98 | is "ip=dhcp". | 98 | is "ip=dhcp". |
99 | 99 | ||
100 | Note that "ip=off" is not the same thing as "ip=::::::off", because in | ||
101 | the latter autoconfiguration will take place if any of DHCP, BOOTP or RARP | ||
102 | are compiled in the kernel. | ||
103 | |||
104 | <client-ip> IP address of the client. | 100 | <client-ip> IP address of the client. |
105 | 101 | ||
106 | Default: Determined using autoconfiguration. | 102 | Default: Determined using autoconfiguration. |
@@ -150,6 +146,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
150 | 146 | ||
151 | off or none: don't use autoconfiguration | 147 | off or none: don't use autoconfiguration |
152 | on or any: use any protocol available in the kernel | 148 | on or any: use any protocol available in the kernel |
149 | (default) | ||
153 | dhcp: use DHCP | 150 | dhcp: use DHCP |
154 | bootp: use BOOTP | 151 | bootp: use BOOTP |
155 | rarp: use RARP | 152 | rarp: use RARP |