diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-04-14 06:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 06:40:06 +0200 |
| commit | ae9fd433d6e245677e6e916a3461be462362e7b8 (patch) | |
| tree | c106c424882c39bfa937e93a99a121174fabaafe /man | |
| parent | man: remove PrivateMounts= from list of other settings in its own description (diff) | |
| parent | network: add mechanism to configure default UseDomains= setting, update man p... (diff) | |
| download | systemd-ae9fd433d6e245677e6e916a3461be462362e7b8.tar.xz systemd-ae9fd433d6e245677e6e916a3461be462362e7b8.zip | |
Merge pull request #32194 from henryli001/lihl/add-defaultUseDomains-config
network: add mechanism to configure default UseDomains= setting
Diffstat (limited to 'man')
| -rw-r--r-- | man/networkd.conf.xml | 18 | ||||
| -rw-r--r-- | man/systemd.network.xml | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml index 3b592e9a67..f751b20104 100644 --- a/man/networkd.conf.xml +++ b/man/networkd.conf.xml @@ -256,6 +256,17 @@ DUIDRawData=00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</programlisting> <xi:include href="version-info.xml" xpointer="v230"/> </listitem> </varlistentry> + + <varlistentry> + <term><varname>UseDomains=</varname></term> + <listitem><para>Specifies the default value for per-network <varname>UseDomains=</varname>. + Takes a boolean. See for details in + <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>. + Defaults to <literal>no</literal>.</para> + + <xi:include href="version-info.xml" xpointer="v256"/> + </listitem> + </varlistentry> </variablelist> </refsect1> @@ -280,6 +291,13 @@ DUIDRawData=00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</programlisting> <xi:include href="version-info.xml" xpointer="v249"/></listitem> </varlistentry> + + <varlistentry> + <term><varname>UseDomains=</varname></term> + <listitem><para>As in the [DHCPv4] section.</para> + + <xi:include href="version-info.xml" xpointer="v256"/></listitem> + </varlistentry> </variablelist> </refsect1> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 3c887b0105..38ab30fb4d 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -2570,7 +2570,9 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting> effect of the <option>Domains=</option> setting. If set to <option>route</option>, the domain name received from the DHCP server will be used for routing DNS queries only, but not for searching, similarly to the effect of the <option>Domains=</option> setting when the argument is prefixed with - <literal>~</literal>. Defaults to false.</para> + <literal>~</literal>. When unspecified, the value specified in the same setting in + <citerefentry><refentrytitle>networkd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + which defaults to <literal>no</literal>, will be used.</para> <para>It is recommended to enable this option only on trusted networks, as setting this affects resolution of all hostnames, in particular of single-label names. It is generally |