summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-08-15 01:08:46 +0200
committerTom Gundersen <teg@jklm.no>2014-08-15 01:08:46 +0200
commit1bd27a45d04639190fc91ad2552b72ea759c0c27 (patch)
treed97cebfd1023482fdf3b024d46f5eabe5ad3fe56
parent784d9b9c09aa1ecdc688f251ea423fb47892f498 (diff)
networkd: don't respect domainname from DHCP by default
Most routers will send garbage, so make this opt-in only.
-rw-r--r--man/systemd.network.xml7
-rw-r--r--src/network/networkd-network.c1
2 files changed, 7 insertions, 1 deletions
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
@@ -447,6 +447,13 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>UseDomainName=</varname></term>
+ <listitem>
+ <para>When true (not the default), the domain name received from the DHCP server
+ will be used for DNS resolution over this link.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>UseRoutes=</varname></term>
<listitem>
<para>When true (the default), the static routes will be requested from the DHCP server
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;