Ignore:
Timestamp:
02/06/2022 04:45:15 AM (2 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
multilib
Children:
2195c1e
Parents:
3e09569 (diff), d759d8b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Automatic merge of trunk into multilib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • chapter09/networkd.xml

    r3e09569 r2590473  
    193193      <para>When using <command>systemd-resolved</command> for DNS
    194194      configuration, it creates the file
    195       <filename>/run/systemd/resolve/resolv.conf</filename>.</para>
     195      <filename>/run/systemd/resolve/stub-resolv.conf</filename>.
     196      And, if <filename>/etc/resolv.conf</filename> does not exist, it
     197      will be created by <command>systemd-resolved</command> as a symlink to
     198      <filename>/run/systemd/resolve/stub-resolv.conf</filename>. So it's
     199      unnecessary to create a <filename>/etc/resolv.conf</filename>
     200      manually.</para>
    196201      <!--Create a
    197202      symlink in <filename>/etc</filename> to use the generated file:</para>
     
    345350     network/system administrator and the machine will be connected to an
    346351     existing network). The optional alias name(s) can be omitted, and the
    347      <replaceable>&lt;192.168.0.2</replaceable> line can be omitted if you
     352     <replaceable>&lt;192.168.0.2&gt;</replaceable> line can be omitted if you
    348353     are using a connection configured with DHCP or IPv6 Autoconfiguration.</para>
    349354
Note: See TracChangeset for help on using the changeset viewer.