networkd: don't respect domainname from DHCP by default

Most routers will send garbage, so make this opt-in only.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 9ef69fa1b72cb2ce3182eece27b041bb14c05f55..f4ca721641c1ac35fe8b6d275bb20569df7981a4 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -446,6 +446,13 @@
                                                 will be used as the transient hostname.</para>
                                         </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>

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 11affb967b9571195facaa76403756cd2e495894..e13e4a0f620b2c585ee09e84489d99d0c4dcd1e9 100644 (file)
--- 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;