From 1bd27a45d04639190fc91ad2552b72ea759c0c27 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Fri, 15 Aug 2014 01:08:46 +0200 Subject: networkd: don't respect domainname from DHCP by default Most routers will send garbage, so make this opt-in only. --- man/systemd.network.xml | 7 +++++++ src/network/networkd-network.c | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 9ef69fa1b7..f4ca721641 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -446,6 +446,13 @@ will be used as the transient hostname. + + UseDomainName= + + When true (not the default), the domain name received from the DHCP server + will be used for DNS resolution over this link. + + UseRoutes= diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 11affb967b..e13e4a0f62 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -83,7 +83,6 @@ static int network_load_one(Manager *manager, const char *filename) { network->dhcp_ntp = true; network->dhcp_dns = true; network->dhcp_hostname = true; - network->dhcp_domainname = true; network->dhcp_routes = true; network->dhcp_sendhost = true; -- cgit v1.2.3-54-g00ecf