From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 18 Feb 2019 15:02:45 +0000 (+0100)
Subject: Merge pull request #10408 from keszybz/analyze-cat-presets
X-Git-Tag: v242-rc1~295
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bde06abd4f3febc149bf137ca68e4abaa2975b4d;p=thirdparty%2Fsystemd.git

Merge pull request #10408 from keszybz/analyze-cat-presets

systemd-analyze cat-presets
---

bde06abd4f3febc149bf137ca68e4abaa2975b4d
diff --cc src/network/networkd-network.c
index 0a7b825835e,04ab5291084..19dd031f293
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@@ -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"