Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751880AbXLDDn5 (ORCPT ); Mon, 3 Dec 2007 22:43:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751358AbXLDDnu (ORCPT ); Mon, 3 Dec 2007 22:43:50 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:39373 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239AbXLDDnt (ORCPT ); Mon, 3 Dec 2007 22:43:49 -0500 Date: Mon, 3 Dec 2007 22:43:45 -0500 From: Amos Waterland To: linux-kernel@vger.kernel.org Cc: horms@verge.net.au, nico-kernel-nfsroot@schottelius.org Subject: [PATCH] Updates to nfsroot documentation Message-ID: <20071204034345.GA30364@us.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.15+20070412 (2007-04-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1915 Lines: 44 The difference between ip=off and ip=::::::off has been a cause of much confusion. Document how each behaves, and do not contradict ourselves by saying that "off" is the default when in fact "any" is the default and is descibed as being so lower in the file. Signed-off-by: Amos Waterland --- nfsroot.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Documentation/nfsroot.txt b/Documentation/nfsroot.txt index 16a7cae..ac04a1d 100644 --- a/Documentation/nfsroot.txt +++ b/Documentation/nfsroot.txt @@ -92,8 +92,11 @@ ip=:::::: autoconfiguration. The parameter can appear alone as the value to the `ip' - parameter (without all the ':' characters before) in which case auto- - configuration is used. + parameter (without all the ':' characters before). If the value is + "ip=off" or "ip=none", no autoconfiguration will take place, otherwise + autoconfiguration will take place. Note that "ip=off" is not the same + thing as "ip=::::::off", because in the latter autoconfiguration will take + place if any of DHCP, BOOTP or RARP are compiled in the kernel. IP address of the client. @@ -142,7 +145,7 @@ ip=:::::: into the kernel will be used, regardless of the value of this option. - off or none: don't use autoconfiguration (default) + off or none: don't use autoconfiguration on or any: use any protocol available in the kernel dhcp: use DHCP bootp: use BOOTP -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/