New upstream version 1.51.90 upstream/1.51.90

1 files changed, 34 insertions, 0 deletions

diff --git a/man/nm-initrd-generator.xml b/man/nm-initrd-generator.xml
index 51015ea8..2d3d8755 100644
--- a/man/nm-initrd-generator.xml
+++ b/man/nm-initrd-generator.xml
@@ -157,6 +157,9 @@
             <member><option>rd.bootif</option></member>
             <member><option>rd.neednet</option></member>
             <member><option>rd.ethtool</option></member>
+            <member><option>rd.net.dns</option></member>
+            <member><option>rd.net.dns-backend</option></member>
+            <member><option>rd.net.dns-resolve-mode</option></member>
             <member><option>rd.net.timeout.dhcp</option></member>
             <member><option>rd.net.dhcp.retry</option></member>
             <member><option>rd.net.dhcp.vendor-class</option></member>
@@ -227,6 +230,37 @@
 
       <listitem>
         <para>NetworkManager supports the
+        <option>rd.net.dns-backend</option>=<replaceable>VALUE</replaceable>
+        kernel command line option to configure the DNS processing
+        mode. See the description of the <literal>"dns"</literal> key in
+        the <literal>"main section"</literal> paragraph of <link
+        linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>. For
+        example: <literal>rd.net.dns-backend=systemd-resolved</literal>,
+        <literal>rd.net.dns-backend=dnsconfd</literal>
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>NetworkManager supports the
+        <option>rd.net.dns</option>=<replaceable>SERVER</replaceable>
+        kernel command line option to configure a global (non
+        interface-specific) DNS server. The option can be specified
+        multiple time to add more than one server. Each server can be
+        specified as a plain IP or as an URI according to the
+        description in the "global-dns-domains sections" paragraph of
+        <link
+        linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link>. For
+        example: <literal>rd.net.dns=2001:db8::1</literal>,
+        <literal>rd.net.dns=dns+tls://192.0.2.0</literal>,
+        <literal>rd.net.dns=dns+tls://[2001:db8::2]:5353#example.org</literal>.
+        In addition, it supports configuring the <literal>"resolve-mode"</literal>
+        key in the global DNS configuration via the
+        <option>rd.net.dns-resolve-mode</option> command line option.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>NetworkManager supports the
         <option>rd.net.dhcp.dscp</option>={<replaceable>CS0</replaceable>|<replaceable>CS4</replaceable>|<replaceable>CS6</replaceable>}
         kernel command line option to set a specific DSCP (TOS) value
         in the IP header of DHCP messages.