X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-network.c;h=f9873100114f5a8186c4ead70f170be8990a0184;hb=3bef724f7e7f7eaca69881548b06e221b77d7031;hp=1606042264b584758f9a7cd7b80076d17c1acc4b;hpb=2ad8416dd057e7e3185169609ca3006e7649f576;p=elogind.git diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 160604226..f98731001 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -144,6 +144,8 @@ void network_free(Network *network) { free(network->description); + address_free(network->dns); + while ((route = network->static_routes)) route_free(route); @@ -166,9 +168,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, @@ -200,6 +199,12 @@ int network_apply(Manager *manager, Network *network, Link *link) { if (r < 0) return r; + if (network->dns) { + r = manager_update_resolv_conf(manager); + if (r < 0) + return r; + } + return 0; }