picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

network: rename Gateway=_dhcp6 -> Gateway=_ipv6ra

This commit is contained in:
Yu Watanabe 2020-10-12 14:52:11 +09:00
parent 1a3a6309a7
commit b8caa4ef34
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.network.xml
View File

@ -1283,9 +1283,8 @@ IPv6Token=prefixstable:2002:da8:1::</programlisting></para>
<term><varname>Gateway=</varname></term>
<listitem>
<para>Takes the gateway address or the special values <literal>_dhcp4</literal> and
<literal>_dhcp6</literal>. If <literal>_dhcp4</literal> or <literal>_dhcp6</literal> is
set, then the gateway address provided by DHCP (or in the IPv6 case, provided by IPv6 RA)
is used.</para>
<literal>_ipv6ra</literal>. If <literal>_dhcp4</literal> or <literal>_ipv6ra</literal> is
set, then the gateway address provided by DHCPv4 or IPv6 RA is used.</para>
</listitem>
</varlistentry>
<varlistentry>

4
src/network/networkd-route.c
View File

@ -1743,7 +1743,7 @@ int config_parse_gateway(
return 0;
}
if (streq(rvalue, "_dhcp6")) {
if (streq(rvalue, "_ipv6ra")) {
n->gw_family = AF_INET6;
n->gateway_from_dhcp_or_ra = true;
TAKE_PTR(n);
@ -2388,7 +2388,7 @@ static int route_section_verify(Route *route, Network *network) {
if (route->gateway_from_dhcp_or_ra) {
log_warning("%s: Deprecated value \"_dhcp\" is specified for Gateway= in [Route] section from line %u. "
"Please use \"_dhcp4\" or \"_dhcp6\" instead. Assuming \"_dhcp4\".",
"Please use \"_dhcp4\" or \"_ipv6ra\" instead. Assuming \"_dhcp4\".",
route->section->filename, route->section->line);
route->family = AF_INET;