Merge pull request #11698 from yuwata/fix-network-route-table

network: honor specified route table

diff --cc src/network/networkd-link.c
Simple merge

diff --cc src/network/networkd-ndisc.c
Simple merge

diff --cc src/network/networkd-network-gperf.gperf
index bd79c5438d497df108f7412814c0de4854a797b7,45343f43479841895c74cd0aa67cda2b94cd4d13..36b09f8681969a8792f52cc312bf403926fedef4
--- 1/src/network/networkd-network-gperf.gperf
--- 2/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@@ -147,11 -146,9 +147,11 @@@ DHCP.IAID
  DHCP.ListenPort,                        config_parse_uint16,                            0,                             offsetof(Network, dhcp_client_port)
  DHCP.RapidCommit,                       config_parse_bool,                              0,                             offsetof(Network, rapid_commit)
  DHCP.ForceDHCPv6PDOtherInformation,     config_parse_bool,                              0,                             offsetof(Network, dhcp6_force_pd_other_information)
 +IPv6AcceptRA.UseAutonomousPrefix,       config_parse_bool,                              0,                             offsetof(Network, ipv6_accept_ra_use_autonomous_prefix)
 +IPv6AcceptRA.UseOnLinkPrefix,           config_parse_bool,                              0,                             offsetof(Network, ipv6_accept_ra_use_onlink_prefix)
  IPv6AcceptRA.UseDNS,                    config_parse_bool,                              0,                             offsetof(Network, ipv6_accept_ra_use_dns)
  IPv6AcceptRA.UseDomains,                config_parse_dhcp_use_domains,                  0,                             offsetof(Network, ipv6_accept_ra_use_domains)
- IPv6AcceptRA.RouteTable,                config_parse_uint32,                            0,                             offsetof(Network, ipv6_accept_ra_route_table)
+ IPv6AcceptRA.RouteTable,                config_parse_section_route_table,               0,                             0
  DHCPServer.MaxLeaseTimeSec,             config_parse_sec,                               0,                             offsetof(Network, dhcp_server_max_lease_time_usec)
  DHCPServer.DefaultLeaseTimeSec,         config_parse_sec,                               0,                             offsetof(Network, dhcp_server_default_lease_time_usec)
  DHCPServer.EmitDNS,                     config_parse_bool,                              0,                             offsetof(Network, dhcp_server_emit_dns)

diff --cc src/network/networkd-network.c
index 2d2332237866d7c2a24ffaa22faed51f73437a48,097eb0adeaffbc88bad19eb85682c634b056ce8d..45bf44cd3631e7fc76b897d566c90bf46ab6e295
--- 1/src/network/networkd-network.c
--- 2/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@@ -206,9 -206,8 +206,10 @@@ int network_load_one(Manager *manager, 
                  .multicast = -1,
                  .allmulticast = -1,
                  .ipv6_accept_ra_use_dns = true,
 +                .ipv6_accept_ra_use_autonomous_prefix = true,
 +                .ipv6_accept_ra_use_onlink_prefix = true,
                  .ipv6_accept_ra_route_table = RT_TABLE_MAIN,
+                 .ipv6_accept_ra_route_table_set = false,
          };
  
          r = config_parse_many(filename, network_dirs, dropin_dirname,

diff --cc src/network/networkd-network.h
Simple merge

diff --cc src/network/networkd-route.c
Simple merge

diff --cc test/test-network/systemd-networkd-tests.py
Simple merge