diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-18 02:31:13 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-04-21 13:55:02 +0900 |
| commit | 8ebafba9f987c21aa5787c8767f2e390b4ec0bc5 (patch) | |
| tree | 618dc66e6aa4ba10c3b4503b3fd52e9eccabd0b8 /src/network/networkd-dhcp-common.c | |
| parent | 415deef9c3e97211c862f39aceabf8e1f1485a41 (diff) | |
| download | systemd-8ebafba9f987c21aa5787c8767f2e390b4ec0bc5.tar.gz | |
network: move RouteMetric= from [DHCPv6] to [IPv6AcceptRA]
As the value is used in the routes in RA.
Diffstat (limited to 'src/network/networkd-dhcp-common.c')
| -rw-r--r-- | src/network/networkd-dhcp-common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index f09f0ee50e..bb0b204467 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -332,14 +332,14 @@ int config_parse_dhcp_route_metric( if (streq_ptr(section, "DHCPv4")) { network->dhcp_route_metric = metric; network->dhcp_route_metric_set = true; - } else if (streq_ptr(section, "DHCPv6")) { - network->dhcp6_route_metric = metric; - network->dhcp6_route_metric_set = true; + } else if (STRPTR_IN_SET(section, "DHCPv6", "IPv6AcceptRA")) { + network->ipv6_accept_ra_route_metric = metric; + network->ipv6_accept_ra_route_metric_set = true; } else { /* [DHCP] section */ if (!network->dhcp_route_metric_set) network->dhcp_route_metric = metric; - if (!network->dhcp6_route_metric_set) - network->dhcp6_route_metric = metric; + if (!network->ipv6_accept_ra_route_metric_set) + network->ipv6_accept_ra_route_metric = metric; } return 0; |