diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-05-18 22:34:07 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-05-18 22:35:42 -0400 |
| commit | e88d8021ba34be32ef5ace32e7243da798b0d1c5 (patch) | |
| tree | 3daf0b14afd424efe3c4156dd273f58bf39febd7 | |
| parent | 41bc22f3a0d5c61e019a0b493c430941d56aba4e (diff) | |
man: explain UseDomains a bit more
https://bugs.freedesktop.org/show_bug.cgi?id=85397
| -rw-r--r-- | man/systemd.network.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 5504b4646c..bdbe239812 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -228,6 +228,10 @@ <para>Enables DHCPv4 and/or DHCPv6 support. Accepts <literal>yes</literal>, <literal>no</literal>, <literal>ipv4</literal>, or <literal>ipv6</literal>.</para> + + <para>Please note that by default the domain name + specified through DHCP is not used for name resolution. + See option <option>UseDomains=</option> below.</para> </listitem> </varlistentry> <varlistentry> @@ -529,6 +533,9 @@ <para>When true (the default), the DNS servers received from the DHCP server will be used and take precedence over any statically configured ones.</para> + + <para>This corresponds to the <option>nameserver</option> + option in <citerefentry project='man-pages'><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> </varlistentry> <varlistentry> @@ -567,7 +574,13 @@ <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> + resolution over this link. When a name cannot be resolved + as specified, the domain name will be used a suffix and + name resolution of that will be attempted.</para> + + <para>This corresponds to the <option>domain</option> + option in <citerefentry project='man-pages'><refentrytitle>resolv.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> + and should not be enabled on untrusted networks.</para> </listitem> </varlistentry> <varlistentry> |