summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAmos Waterland <apw@us.ibm.com>2008-01-05 23:23:06 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-08 23:29:58 -0800
commit92ffb85dd33d62ac1dad8b44da62365f2aad413d (patch)
tree248504c621af6bb50c9a399b9540c2e6500a1e30 /Documentation
parentf844c74fe07321953e2dd227fe35280075f18f60 (diff)
downloadop-kernel-dev-92ffb85dd33d62ac1dad8b44da62365f2aad413d.zip
op-kernel-dev-92ffb85dd33d62ac1dad8b44da62365f2aad413d.tar.gz
[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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt
index c86dd38..31b3291 100644
--- a/Documentation/nfsroot.txt
+++ b/Documentation/nfsroot.txt
@@ -145,6 +145,7 @@ ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
this option.
off or none: don't use autoconfiguration
+ (do static IP assignment instead)
on or any: use any protocol available in the kernel
(default)
dhcp: use DHCP
OpenPOWER on IntegriCloud