networkd: DHCPv4 - allow opting out of using DNS servers

[elogind.git] / src / network / networkd-network.c

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index f2546440cf55eb8e9fd32af665a2f6cf45e4b9b6..498dea65fe8d76f229d1c5544e4e3d4e64011e84 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -65,7 +65,9 @@ static int network_load_one(Manager *manager, const char *filename) {
         if (!network->filename)
                 return log_oom();
 
-        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0", config_item_perf_lookup,
+        network->dhcp_dns = true;
+
+        r = config_parse(NULL, filename, file, "Match\0Network\0Address\0Route\0DHCPv4\0", config_item_perf_lookup,
                         (void*) network_gperf_lookup, false, false, network);
         if (r < 0) {
                 log_warning("Could not parse config file %s: %s", filename, strerror(-r));
@@ -144,6 +146,8 @@ void network_free(Network *network) {
 
         free(network->description);
 
+        address_free(network->dns);
+
         while ((route = network->static_routes))
                 route_free(route);
 
@@ -197,6 +201,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;
 }