networkd: don't automatically reload config at runtime

We don't know if the config will be consistent, so do as systemd itself and only
load config when the daemon starts (and possibly, in the future, when explicitly requested).

diff --git a/src/network/networkd-bridge.c b/src/network/networkd-bridge.c
index 430b5c53d3068023403505d962862cf409909f19..7de7546358a7ab6e25882de8c5fcda928abde239 100644 (file)
--- a/src/network/networkd-bridge.c
+++ b/src/network/networkd-bridge.c
@@ -55,9 +55,6 @@ int bridge_get(Manager *manager, const char *name, Bridge **ret) {
         assert(name);
         assert(ret);
 
-        if (manager_should_reload(manager))
-                manager_load_config(manager);
-
         bridge = hashmap_get(manager->bridges, name);
         if (!bridge) {
                 *ret = NULL;

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 1606042264b584758f9a7cd7b80076d17c1acc4b..f2546440cf55eb8e9fd32af665a2f6cf45e4b9b6 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -166,9 +166,6 @@ int network_get(Manager *manager, struct udev_device *device, Network **ret) {
         assert(device);
         assert(ret);
 
-        if (manager_should_reload(manager))
-                manager_load_config(manager);
-
         LIST_FOREACH(networks, network, manager->networks) {
                 if (net_match_config(network->match_mac, network->match_path,
                                         network->match_driver, network->match_type,