From e05311702be3e2e77c486059fd7cf2420e997f3c Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Thu, 27 Oct 2016 23:22:45 +0000
Subject: [PATCH] Moved /etc/resolv.conf symlink to Chapter 7.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11138 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  9 +++++++++
 chapter06/systemd.xml   |  4 ----
 chapter07/networkd.xml  | 11 ++++++-----
 general.ent             |  6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 39b8059b3..22b41e04f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem revision="systemd">
+      <para>2016-10-27</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Moved /etc/resolv.conf symlink to Chapter 7.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>2016-10-23</para>
       <itemizedlist>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 3354320c3..05c02251e 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -220,10 +220,6 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 
 <screen><userinput remap="install">systemd-machine-id-setup</userinput></screen>
 
-    <para>Fix a broken symlink created by the systemd installation process:</para>
-<screen><userinput remap="install">rm -fv /etc/resolv.conf
-ln -sv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
-
     <para>Since the testsuite largely depends on the host system kernel
     configuration, some tests may fail. It also needs a modification in
     order not to look for a program that will be installed by Util-Linux
diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml
index 3d7b3f2d4..fc7454678 100644
--- a/chapter07/networkd.xml
+++ b/chapter07/networkd.xml
@@ -25,7 +25,7 @@
     basic network configuration. Additionally, since version 213, DNS name
     resolution can be handled by <command>systemd-resolved</command> in place
     of a static <filename>/etc/resolv.conf</filename> file. Both services are
-    enabled by default, and absolutely should not be disabled.</para>
+    enabled by default.</para>
 
     <para>Configuration files for <command>systemd-networkd</command> (and
     <command>systemd-resolved</command>) can be placed in
@@ -119,10 +119,11 @@ EOF</userinput></screen>
       used.</para></note>
 
       <para>When using <command>systemd-resolved</command> for DNS
-      configuration, it is responsible for creating the
-      <filename>/etc/resolv.conf</filename> file. Since version 226, the
-      symlink for <filename>/etc/resolv.conf</filename> is created by systemd
-      when needed, so no further configuration is necessary.</para>
+      configuration, it creates the file
+      <filename>/run/systemd/resolve/resolv.conf</filename>. Create a
+      symlink in <filename>/etc</filename> to use the generatd file:</para>
+
+<screen><userinput remap="install">ln -sfv /run/systemd/resolve/resolv.conf /etc/resolv.conf</userinput></screen>
 
     </sect3>
 
diff --git a/general.ent b/general.ent
index 9faf6ad02..08eeec040 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20161023">
+<!ENTITY version         "SVN-20161027">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20161023-systemd">
+<!ENTITY versiond        "20161027-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "October 23, 2016">
+<!ENTITY releasedate     "October 27, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.11">