From 23caf9baf2e9a3b83b8e739fb7d17151cd08280d Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 29 Apr 2016 19:08:37 -0400 Subject: man: s/similar/similarly/ --- man/systemd.network.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'man') diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 2a20748376..8ebd72dbf2 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -829,11 +829,11 @@ DUIDRawData= Specifies the DHCP DUID bytes as a single newline-terminated, hexadecimal string, with each - byte separated by a ':'. A DHCPv6 client sends the DHCP Unique Identifier (DUID) and the interface Identity - Association Identifier (IAID) to a DHCP server when acquiring a dynamic IPv6 address. Similar, DHCPv4 clients - send the IAID and DUID to the DHCP server when acquiring a dynamic IPv4 address if - . IAID and DUID allows a DHCP server to uniquely identify the machine - and the interface requesting a DHCP IP address. + byte separated by a :. A DHCPv6 client sends the DHCP Unique Identifier (DUID) and the + interface Identity Association Identifier (IAID) to a DHCP server when acquiring a dynamic IPv6 + address. Similarly, DHCPv4 clients send the IAID and DUID to the DHCP server when acquiring a dynamic IPv4 + address if . IAID and DUID allows a DHCP server to uniquely identify + the machine and the interface requesting a DHCP IP address. The DUID value specified here takes precedence over the DUID that systemd-networkd generates using the machine-id from the /etc/machine-id file, as well as the -- cgit v1.2.3-54-g00ecf From e2e08e77cc6b13cc8b3658ad504814834a0e9872 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 29 Apr 2016 20:16:55 -0400 Subject: man: add a description of DUIDType and DUIDRawData MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is essentially a revert of f38e0cce75ff2ffbd99f7e382ed39c160bb7d799 (which removed the documentation of DUIDType on purpose). The description is heavily updated for the new semantics. This addresses #3127 § 4. --- man/networkd.conf.xml | 81 +++++++++++++++++++++++++++++++++++++------------ man/systemd.network.xml | 33 +++++++++++--------- 2 files changed, 80 insertions(+), 34 deletions(-) (limited to 'man') diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml index 5166e05cbc..4bfc4f773a 100644 --- a/man/networkd.conf.xml +++ b/man/networkd.conf.xml @@ -58,14 +58,14 @@ Description These configuration files control global network parameters. - For e.g. DHCP Unique Identifier (DUID). + Currently the DHCP Unique Identifier (DUID). - [DUID] Section Options + [DHCP] Section Options This section configures the DHCP Unique Identifier (DUID) value used by DHCP protocol. DHCPv6 client protocol sends the DHCP Unique Identifier and the interface @@ -73,28 +73,71 @@ address. DHCPv4 client protocol sends IAID and DUID to the DHCP server when acquiring a dynamic IPv4 address if . IAID and DUID allows a DHCP server to uniquely identify the machine and the interface requesting a DHCP IP. - To configure IAID and ClientIdentifier, see systemd.network - 5. + To configure IAID and ClientIdentifier, see + systemd.network5. + - The DUID value specified here overrides the DUID that systemd-networkd - generates using the machine-id from the /etc/machine-id file. - To configure DUID per-network, see systemd.network - 5. - - The configured DHCP DUID should conform to the specification in - RFC 3315, - RFC 6355. To configure IAID, see - systemd.network5 - . - - The following options are available in [DUID] section: + The following options are understood: + + DUIDType= + Specifies how the DUID should be generated. See + RFC 3315 + for a description of all the options. + + The following values are understood: + + + + If DUIDType=vendor, then the DUID value will be generated using + 43793 as the vendor identifier (systemd) and hashed contents of + machine-id5. + This is the default if DUIDType= is not specified. + + + + + + + + Those values are parsed and can be used to set the DUID type + field, but DUID contents must be provided using DUIDRawData=. + + + + + + In all cases, DUIDRawData= can be used to override the + actual DUID value that is used. + - RawData= - Specifies the DUID bytes as a single newline-terminated, hexadecimal - string, with each byte separated by a ':'. + DUIDRawData= + Specifies the DHCP DUID value as a single newline-terminated, hexadecimal string, with each + byte separated by :. The DUID that is sent is composed of the DUID type specified by + DUIDType= and the value configured here. + + The DUID value specified here overrides the DUID that systemd-networkd generates using the machine-id + from the /etc/machine-id file. To configure DUID per-network, see + systemd.network 5. + The configured DHCP DUID should conform to the specification in + RFC 3315, + RFC 6355. To configure IAID, see + systemd.network5 + . + + + A <option>DUIDType=vendor</option> with a custom value + + DUIDType=vendor +DUIDRawData=00:00:ab:11:f9:2a:c2:77:29:f9:5c:00 + + This specifies a 14 byte DUID, with the type DUID-EN (00:02), enterprise number + 43793 (00:00:ab:11), and identifier value f9:2a:c2:77:29:f9:5c:00. + + + diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 8ebd72dbf2..992cd6b07c 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -812,6 +812,7 @@ false. + ClientIdentifier= @@ -819,6 +820,7 @@ or duid (the default, see below) to use a RFC4361-compliant Client ID. + VendorClassIdentifier= @@ -826,25 +828,25 @@ type and configuration. - - DUIDRawData= - Specifies the DHCP DUID bytes as a single newline-terminated, hexadecimal string, with each - byte separated by a :. A DHCPv6 client sends the DHCP Unique Identifier (DUID) and the - interface Identity Association Identifier (IAID) to a DHCP server when acquiring a dynamic IPv6 - address. Similarly, DHCPv4 clients send the IAID and DUID to the DHCP server when acquiring a dynamic IPv4 - address if . IAID and DUID allows a DHCP server to uniquely identify - the machine and the interface requesting a DHCP IP address. - The DUID value specified here takes precedence over the DUID that systemd-networkd generates - using the machine-id from the /etc/machine-id file, as well as the - global DUID that may be specified in networkd.conf - 5. + + DUIDType= + + Override the global DUIDType setting for this network. See + networkd.conf5 + for a description of possible values. + + - The configured DHCP DUID should conform to the specification in - RFC 3315, - RFC 6355. + + DUIDRawData= + + Override the global DUIDRawData setting for this network. See + networkd.conf5 + for a description of possible values. + RequestBroadcast= @@ -856,6 +858,7 @@ networks where broadcasts are filtered out. + RouteMetric= -- cgit v1.2.3-54-g00ecf