diff options
Diffstat (limited to 'Documentation/nfsroot.txt')
-rw-r--r-- | Documentation/nfsroot.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index 16a7cae2721d..9b956a969362 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt | |||
@@ -92,8 +92,14 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
92 | autoconfiguration. | 92 | autoconfiguration. |
93 | 93 | ||
94 | The <autoconf> parameter can appear alone as the value to the `ip' | 94 | The <autoconf> parameter can appear alone as the value to the `ip' |
95 | parameter (without all the ':' characters before) in which case auto- | 95 | parameter (without all the ':' characters before). If the value is |
96 | configuration is used. | 96 | "ip=off" or "ip=none", no autoconfiguration will take place, otherwise |
97 | autoconfiguration will take place. The most common way to use this | ||
98 | is "ip=dhcp". | ||
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. | ||
97 | 103 | ||
98 | <client-ip> IP address of the client. | 104 | <client-ip> IP address of the client. |
99 | 105 | ||
@@ -142,7 +148,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
142 | into the kernel will be used, regardless of the value of | 148 | into the kernel will be used, regardless of the value of |
143 | this option. | 149 | this option. |
144 | 150 | ||
145 | off or none: don't use autoconfiguration (default) | 151 | off or none: don't use autoconfiguration |
146 | on or any: use any protocol available in the kernel | 152 | on or any: use any protocol available in the kernel |
147 | dhcp: use DHCP | 153 | dhcp: use DHCP |
148 | bootp: use BOOTP | 154 | bootp: use BOOTP |