diff options
author | Amos Waterland <apw@us.ibm.com> | 2008-01-06 02:23:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-09 02:29:58 -0500 |
commit | 92ffb85dd33d62ac1dad8b44da62365f2aad413d (patch) | |
tree | 248504c621af6bb50c9a399b9540c2e6500a1e30 /Documentation | |
parent | f844c74fe07321953e2dd227fe35280075f18f60 (diff) |
[IPV4] ipconfig: Fix regression in ip command line processing
The recent changes for ip command line processing fixed some problems
but unfortunately broke some common usage scenarios. In current
2.6.24-rc6 the following command line results in no IP address
assignment, which is surely a regression:
ip=10.0.2.15::10.0.2.2:255.255.255.0::eth0:off
Please find below a patch that works for all cases I can find.
Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/nfsroot.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index c86dd38e2281..31b329172343 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt | |||
@@ -145,6 +145,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> | |||
145 | this option. | 145 | this option. |
146 | 146 | ||
147 | off or none: don't use autoconfiguration | 147 | off or none: don't use autoconfiguration |
148 | (do static IP assignment instead) | ||
148 | on or any: use any protocol available in the kernel | 149 | on or any: use any protocol available in the kernel |
149 | (default) | 150 | (default) |
150 | dhcp: use DHCP | 151 | dhcp: use DHCP |