aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter07/clock.xml10
-rw-r--r--chapter07/network.xml24
2 files changed, 20 insertions, 14 deletions
diff --git a/chapter07/clock.xml b/chapter07/clock.xml
index 455b75a8f..558693360 100644
--- a/chapter07/clock.xml
+++ b/chapter07/clock.xml
@@ -82,12 +82,14 @@ EOF</userinput></screen>
<para>The daemon is not intended as a replacement for the well
established NTP daemon, but as a client only implementation
of the SNTP protocol which can be used for less advanced
- tasks and on a resource limited systems.</para>
+ tasks and on resource limited systems.</para>
- <para>To enable the <command>systemd-timesyncd</command> daemon,
- issue the following command:</para>
+ <para>Starting with systemd version 216, the
+ <command>systemd-timesyncd</command> daemon is enabled by
+ default. If you want to disable it, issue the following
+ command:</para>
-<screen role="nodump"><userinput>systemctl enable systemd-timesyncd</userinput></screen>
+<screen role="nodump"><userinput>systemctl disable systemd-timesyncd</userinput></screen>
<para>The <filename>/etc/systemd/timesyncd.conf</filename> file
can be used to change the NTP servers that
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 7caefb683..141715e8b 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -101,19 +101,10 @@ EOF</userinput></screen>
from the ISP or network administrator, into
<filename>/etc/resolv.conf</filename>.</para>
- <para>When using <command>systemd-networkd</command> for network
- configuration, another daemon, <command>systemd-resolved</command>,
- is responsible for creating the <filename>/etc/resolv.conf</filename>
- file. It is, however, placed in a non-standard location which is
- writable since early boot, so it is necessary to create a symlink
- to it by running the following command:</para>
-
-<screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
-
<para>If static <filename>/etc/resolv.conf</filename> is desired, create
it by running the following command:</para>
-<screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
+<screen role="nodump"><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
<literal># Begin /etc/resolv.conf
domain <replaceable>&lt;Your Domain Name&gt;</replaceable>
@@ -136,6 +127,19 @@ EOF</userinput></screen>
<note><para>The Google Public IPv4 DNS addresses are 8.8.8.8 and 8.8.4.4.</para></note>
+ <para>When using <command>systemd-networkd</command> for network
+ configuration, another daemon, <command>systemd-resolved</command>,
+ is responsible for creating the <filename>/etc/resolv.conf</filename>
+ file. It is, however, placed in a non-standard location which is
+ writable since early boot, so it is necessary to create a symlink
+ to it by running the following command:</para>
+
+<screen><userinput>ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
+
+ <para>This is required if you are specifying DNS entries in <filename
+ class="extension">.network</filename> files or using the built in
+ DHCP client to obtain DNS addresses.</para>
+
</sect2>
<sect2 id="ch-scripts-hostname">