39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
|
From e7cbf8fd30ec39736b4f19fa2e68eba9776b8a80 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anton Blanchard <anton@samba.org>
|
||
|
|
Date: Tue, 27 Dec 2011 09:08:29 +1100
|
||
|
|
Subject: [PATCH] ip= server-id should be server-IP
|
||
|
|
|
||
|
|
From looking at the code it seems like server-id should really
|
||
|
|
be named server-IP.
|
||
|
|
---
|
||
|
|
dracut.cmdline.7.xml | 2 +-
|
||
|
|
modules.d/40network/parse-ip-opts.sh | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut.cmdline.7.xml b/dracut.cmdline.7.xml
|
||
|
|
index 87fb4ad..74e617c 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><client-IP></replaceable>:
|
||
|
|
- <replaceable><server-id></replaceable>
|
||
|
|
+ <replaceable><server-IP></replaceable>
|
||
|
|
:<replaceable><gateway-IP></replaceable>:<replaceable><netmask></replaceable>:<replaceable><client_hostname></replaceable>:<replaceable><interface></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 3e83ee3..77dbaf0 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
|