From: Anton Blanchard <anton@samba.org>
Date: Mon, 26 Dec 2011 22:08:29 +0000 (+1100)
Subject: ip= server-id should be server-IP
X-Git-Tag: 015~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7cbf8fd30ec39736b4f19fa2e68eba9776b8a80;p=thirdparty%2Fdracut.git

ip= server-id should be server-IP

 From looking at the code it seems like server-id should really
be named server-IP.
---

diff --git a/dracut.cmdline.7.xml b/dracut.cmdline.7.xml
index 87fb4ad88..74e617c13 100644
--- a/dracut.cmdline.7.xml
+++ b/dracut.cmdline.7.xml
@@ -453,7 +453,7 @@ with a valid DHCP root-path.</para>
         </varlistentry>
         <varlistentry>
           <term><envar>ip=</envar><replaceable>&lt;client-IP&gt;</replaceable>:
-              <replaceable>&lt;server-id&gt;</replaceable>
+              <replaceable>&lt;server-IP&gt;</replaceable>
             :<replaceable>&lt;gateway-IP&gt;</replaceable>:<replaceable>&lt;netmask&gt;</replaceable>:<replaceable>&lt;client_hostname&gt;</replaceable>:<replaceable>&lt;interface&gt;</replaceable>:<replaceable>{none|off}</replaceable></term>
           <listitem>
             <para>explicit network configuration. If you want do define a IPv6 address, put it in brackets (e.g. [2001:DB8::1]).
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
index 3e83ee3b3..77dbaf07b 100755
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.sh
@@ -7,7 +7,7 @@
 #
 #       ip=<interface>:[dhcp|on|any]
 #
-#       ip=<client-IP-number>:<server-id>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|none|off]
+#       ip=<client-IP-number>:<server-IP-number>:<gateway-IP-number>:<netmask>:<client-hostname>:<interface>:[dhcp|on|any|none|off]
 #
 # When supplying more than only ip= line, <interface> is mandatory and
 # bootdev= must contain the name of the primary interface to use for