From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 27 Aug 2015 14:47:26 +0000 (+0200)
Subject: networkd: emit DNS/NTP/Timezone info via DHCP server by default
X-Git-Tag: v226~89^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=539f2a73815136cb614e401fbf7807f1ff871d24;p=platform%2Fupstream%2Fsystemd.git

networkd: emit DNS/NTP/Timezone info via DHCP server by default

If we have the data, emit it by default.
---

diff --git a/network/80-container-ve.network b/network/80-container-ve.network
index f23b63a..72c20eb 100644
--- a/network/80-container-ve.network
+++ b/network/80-container-ve.network
@@ -15,6 +15,3 @@ Address=0.0.0.0/28
 LinkLocalAddressing=yes
 DHCPServer=yes
 IPMasquerade=yes
-
-[DHCPServer]
-EmitTimezone=yes
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 848ec66..2a77242 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -107,6 +107,10 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->dhcp_route_metric = DHCP_ROUTE_METRIC;
         network->dhcp_client_identifier = DHCP_CLIENT_ID_DUID;
 
+        network->dhcp_server_emit_dns = true;
+        network->dhcp_server_emit_ntp = true;
+        network->dhcp_server_emit_timezone = true;
+
         network->use_bpdu = true;
         network->allow_port_to_be_root = true;
         network->unicast_flood = true;