summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-11 20:16:13 +0000
committerTom Gundersen <teg@jklm.no>2014-01-12 15:37:21 +0100
commitf46685a4c0780173e5291fb7c3caa1c35cb1d0af (patch)
tree973368fa0aa06d3ed6905696a71ddbc5056d5f85
parentab47d620b459ce45774237ca1a38b5218426c897 (diff)
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).
-rw-r--r--src/network/networkd-bridge.c3
-rw-r--r--src/network/networkd-network.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/src/network/networkd-bridge.c b/src/network/networkd-bridge.c
index 430b5c53d3..7de7546358 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 1606042264..f2546440cf 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,