From b8caa4ef34d701c44dabd80a6d259da783fa0edb Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 12 Oct 2020 14:52:11 +0900
Subject: [PATCH] network: rename Gateway=_dhcp6 -> Gateway=_ipv6ra

---
 man/systemd.network.xml      | 5 ++---
 src/network/networkd-route.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 512d657138..5307a508d3 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -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>
diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 86404b9dc6..da8a12dc71 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -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;