Merge pull request #10408 from keszybz/analyze-cat-presets
authorLennart Poettering <lennart@poettering.net>
Mon, 18 Feb 2019 15:02:45 +0000 (16:02 +0100)
committerGitHub <noreply@github.com>
Mon, 18 Feb 2019 15:02:45 +0000 (16:02 +0100)
systemd-analyze cat-presets

1  2 
meson.build
src/libsystemd-network/network-internal.h
src/network/netdev/netdev.c
src/network/networkd-manager.c
src/network/networkd-network.c
src/udev/net/link-config.c
src/udev/udev-rules.c

diff --cc meson.build
Simple merge
Simple merge
Simple merge
@@@ -209,10 -209,9 +209,10 @@@ int network_load_one(Manager *manager, 
                  .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,
+         r = config_parse_many(filename, NETWORK_DIRS, dropin_dirname,
                                "Match\0"
                                "Link\0"
                                "Network\0"
Simple merge
Simple merge