summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-07 20:19:19 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-07 20:19:19 -0400
commit74dd72d559911bd56f9865a273c355e4e2e48fae (patch)
treeb3b48382a95595b6b9a37cfbc95a2afe5009d61a /man
parent3aa131c4cacc3e381d21f061a87da1cddd4963cb (diff)
parentf38e0cce75ff2ffbd99f7e382ed39c160bb7d799 (diff)
Merge pull request #2943 from vinaykul/systemd_duid_review_fixes
DHCP DUID parsing fix, logging fix, man-page fix
Diffstat (limited to 'man')
-rw-r--r--man/networkd.conf.xml48
-rw-r--r--man/systemd.network.xml48
2 files changed, 0 insertions, 96 deletions
diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 0d8f00106c..5166e05cbc 100644
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -92,27 +92,6 @@
<variablelist class='network-directives'>
<varlistentry>
- <term><varname>Type=</varname></term>
- <listitem><para>The type of DUID specified in this section. The following values are
- supported:</para>
- <para>raw : If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies
- the entire DUID. For e.g: <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
- specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
- and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
- RawData is specified, Type defaults to 'raw'.</para>
- <para>Type will support the following values in the future:</para>
- <para>link-layer-and-time : If <literal>Type=link-layer-and-time</literal>, then
- <literal>MACAddress=</literal> and <literal>TimeStamp=</literal> specify the hardware
- address and time-stamp for DUID-LLT.</para>
- <para>vendor : If <literal>Type=vendor</literal>, then <literal>EnterpriseNumber=</literal>
- and <literal>RawData=</literal> specify the enterprise number and identifier for DUID-EN.</para>
- <para>link-layer : If <literal>Type=link-layer</literal>, then <literal>MACAddress=</literal>
- specifies the hardware address for DUID-LL.</para>
- <para>uuid : If <literal>Type=uuid</literal>, then <literal>UUID=</literal> specifies DUID-UUID.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><varname>RawData=</varname></term>
<listitem><para>Specifies the DUID bytes as a single newline-terminated, hexadecimal
string, with each byte separated by a ':'.</para></listitem>
@@ -121,33 +100,6 @@
</refsect1>
<refsect1>
- <para>The following options will be supported in the future:
- </para>
- <variablelist>
- <varlistentry>
- <term><varname>MACAddress=</varname></term>
- <listitem><para>Specifies the link-layer address for DUID Type <option>link-layer
- </option> or <option>link-layer-and-time</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>TimeStamp=</varname></term>
- <listitem><para>Specifies the DUID generation time for DUID Type <option>
- link-layer-and-time</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>EnterpriseNumber=</varname></term>
- <listitem><para>Specifies the enterprise number for DUID Type
- <option>vendor</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>UUID=</varname></term>
- <listitem><para>Specifies the UUID for DUID Type <option>uuid</option>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
<title>See Also</title>
<para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index c14d3770e2..c9ef041004 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -853,27 +853,6 @@
<variablelist class='network-directives'>
<varlistentry>
- <term><varname>Type=</varname></term>
- <listitem><para>The type of DUID specified in this section. The following values are
- supported:</para>
- <para>raw : If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies
- the entire DUID. For e.g: <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
- specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
- and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
- RawData is specified, Type defaults to 'raw'.</para>
- <para>Type will support the following values in the future:</para>
- <para>link-layer-and-time : If <literal>Type=link-layer-and-time</literal>, then
- <literal>MACAddress=</literal> and <literal>TimeStamp=</literal> specify the hardware
- address and time-stamp for DUID-LLT.</para>
- <para>vendor : If <literal>Type=vendor</literal>, then <literal>EnterpriseNumber=</literal>
- and <literal>RawData=</literal> specify the enterprise number and identifier for DUID-EN.</para>
- <para>link-layer : If <literal>Type=link-layer</literal>, then <literal>MACAddress=</literal>
- specifies the hardware address for DUID-LL.</para>
- <para>uuid : If <literal>Type=uuid</literal>, then <literal>UUID=</literal> specifies DUID-UUID.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><varname>RawData=</varname></term>
<listitem><para>Specifies the DUID bytes as a single newline-terminated, hexadecimal
string, with each byte separated by a ':'.</para></listitem>
@@ -883,33 +862,6 @@
</refsect1>
<refsect1>
- <para>The following options will be supported in the future:
- </para>
- <variablelist>
- <varlistentry>
- <term><varname>MACAddress=</varname></term>
- <listitem><para>Specifies the link-layer address for DUID Type <option>link-layer
- </option> or <option>link-layer-and-time</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>TimeStamp=</varname></term>
- <listitem><para>Specifies the DUID generation time for DUID Type <option>
- link-layer-and-time</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>EnterpriseNumber=</varname></term>
- <listitem><para>Specifies the enterprise number for DUID Type <option>
- vendor</option>.</para></listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>UUID=</varname></term>
- <listitem><para>Specifies the UUID for DUID Type <option>uuid</option>.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
<title>[DHCPServer] Section Options</title>
<para>The <literal>[DHCPServer]</literal> section contains
settings for the DHCP server, if enabled via the