shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

network: dhcp6: make UplinkInterface=:self take effect only when DHCPv6PrefixDelegation= is enabled

Browse Source
This commit is contained in:
Yu Watanabe 2021-12-01 14:48:51 +09:00
parent f6032ff3e0
commit 926fc8ee63
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man/systemd.network.xml
View File

@ -2106,11 +2106,12 @@ Table=1234</programlisting></para>
<listitem> <listitem>
<para>Allows DHCPv6 client to start without router advertisements's managed or other <para>Allows DHCPv6 client to start without router advertisements's managed or other
address configuration flag. Takes one of <literal>no</literal>, <literal>solicit</literal> address configuration flag. Takes one of <literal>no</literal>, <literal>solicit</literal>
or <literal>information-request</literal>. When this is not specified and or <literal>information-request</literal>. If this is not specified,
<varname>UplinkInterface=:self</varname> is specified, then <literal>solicit</literal> is <literal>solicit</literal> is used when <varname>DHCPv6PrefixDelegation=</varname> is
implied. Otherwise, defaults to <literal>no</literal>, and the DHCPv6 client will be enabled and <varname>UplinkInterface=:self</varname> is specified in the
started when an RA is received. See also <varname>DHCPv6Client=</varname> setting in the [DHCPv6PrefixDelegation] section. Otherwise, defaults to <literal>no</literal>, and the
[IPv6AcceptRA] section.</para> DHCPv6 client will be started when an RA is received. See also
<varname>DHCPv6Client=</varname> setting in the [IPv6AcceptRA] section.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

3
src/network/networkd-dhcp6.c
View File

@ -70,6 +70,9 @@ static DHCP6ClientStartMode link_get_dhcp6_client_start_mode(Link *link) {
if (link->network->dhcp6_client_start_mode >= 0) if (link->network->dhcp6_client_start_mode >= 0)
return link->network->dhcp6_client_start_mode; return link->network->dhcp6_client_start_mode;
if (!link_dhcp6_pd_is_enabled(link))
return DHCP6_CLIENT_START_MODE_NO;
if (dhcp6_pd_resolve_uplink(link, &uplink) < 0) if (dhcp6_pd_resolve_uplink(link, &uplink) < 0)
return DHCP6_CLIENT_START_MODE_NO; return DHCP6_CLIENT_START_MODE_NO;