]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #15495 from keszybz/resolve-debugging-and-stub-handling
authorLennart Poettering <lennart@poettering.net>
Tue, 21 Apr 2020 07:34:21 +0000 (09:34 +0200)
committerGitHub <noreply@github.com>
Tue, 21 Apr 2020 07:34:21 +0000 (09:34 +0200)
Resolve debugging and stub handling

1  2 
man/resolvectl.xml

diff --combined man/resolvectl.xml
index a7de5a309f42382d071ca14b16c081027dcaed31,75be5fe072677967ae91d2b22c3035f242d747c6..cc049945941d3ae9b5a2789758d6d1d12e27ca49
          automatically, an explicit reverting is not necessary in that case.</para></listitem>
        </varlistentry>
  
+       <xi:include href="systemctl.xml" xpointer="log-level" />
      </variablelist>
    </refsect1>
  
    </refsect1>
  
    <refsect1>
 -    <title>Compatibility with <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
 +    <title>Compatibility with
 +    <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry></title>
  
      <para><command>resolvectl</command> is a multi-call binary. When invoked as <literal>resolvconf</literal>
      (generally achieved by means of a symbolic link of this name to the <command>resolvectl</command> binary) it
 -    is run in a limited <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry>
 +    is run in a limited
 +    <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry>
      compatibility mode. It accepts mostly the same arguments and pushes all data into
      <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
      similar to how <option>dns</option> and <option>domain</option> commands operate. Note that
      <command>systemd-resolved.service</command> is the only supported backend, which is different from other
 -    implementations of this command. Note that not all operations supported by other implementations are supported
 -    natively. Specifically:</para>
 +    implementations of this command.</para>
 +
 +    <para><filename>/etc/resolv.conf</filename> will only be updated with servers added with this command
 +    when <filename>/etc/resolv.conf</filename> is a symlink to
 +    <filename>/run/systemd/resolve/resolv.conf</filename>, and not a static file. See the discussion of
 +    <filename>/etc/resolv.conf</filename> handling in
 +    <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
 +    </para>
 +
 +    <para>Not all operations supported by other implementations are supported natively. Specifically:</para>
  
      <variablelist>
        <varlistentry>
  
      </variablelist>
  
 -    <para>See <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> for details on this command line options.</para>
 +    <para>See
 +    <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry>
 +    for details on those command line options.</para>
    </refsect1>
  
    <refsect1>