summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-08-27 16:47:26 +0200
committerLennart Poettering <lennart@poettering.net>2015-08-27 16:47:26 +0200
commit539f2a73815136cb614e401fbf7807f1ff871d24 (patch)
tree8b2a7810d071d12f8f2870040e9512d833a8a747
parent4f5f911e81ae6377ab925c1dd133013c640ab32e (diff)
networkd: emit DNS/NTP/Timezone info via DHCP server by default
If we have the data, emit it by default.
-rw-r--r--network/80-container-ve.network3
-rw-r--r--src/network/networkd-network.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/network/80-container-ve.network b/network/80-container-ve.network
index f23b63adf4..72c20eba55 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 848ec66151..2a77242013 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;