From: Tom Gundersen <teg@jklm.no>
Date: Sat, 11 Jan 2014 20:16:13 +0000 (+0000)
Subject: networkd: don't automatically reload config at runtime
X-Git-Tag: v209~453
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f46685a4c0780173e5291fb7c3caa1c35cb1d0af;p=thirdparty%2Fsystemd.git

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 430b5c53d30..7de7546358a 100644
--- 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 1606042264b..f2546440cf5 100644
--- 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,