From 28cf0f7c941af80f1310990f4f7bfc392ad31a07 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 10 Oct 2016 21:07:26 +0000
Subject: [PATCH] (systemd) Fixed the resolv.conf symlink and added note about
 using our generated tarball

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11133 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 16 ++++++++++++++++
 chapter03/packages.xml  | 10 ++++++++++
 chapter06/systemd.xml   |  2 +-
 general.ent             |  6 +++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 581b7a2a2..8260a0298 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,22 @@
     <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-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Added a note about using the
+          <application>systemd</application> source tarball generated by the
+          LFS systemd team.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Fixed the symlink for /etc/resolv.conf in the
+          systemd page in Chapter 6. Thanks goes to DJ Lucas and
+          Wayne for reporting this.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-10-09</para>
       <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 97e1c6948..1bc7bc5d4 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -585,6 +585,16 @@
         <para>Home page: <ulink url="&systemd-home;"/></para>
         <para>Download: <ulink url="&systemd-url;"/></para>
         <para>MD5 sum: <literal>&systemd-md5;</literal></para>
+
+        <note>
+          <para>The Linux From Scratch systemd team generates its own tarball
+          of the systemd source. This is done in order to generate the manual
+          pages and documentation, as well as prevent unnecessary files from
+          the <application>systemd</application> git repo from being installed
+          on the system. Please use the version generated by the Linux From
+          Scratch team.</para>
+        </note>
+
       </listitem>
     </varlistentry>
 
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index cce7c1177..3354320c3 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -222,7 +222,7 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 
     <para>Fix a broken symlink created by the systemd installation process:</para>
 <screen><userinput remap="install">rm -fv /etc/resolv.conf
-ln -s ../lib/systemd/resolv.conf /etc/resolv.conf</userinput></screen>
+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
diff --git a/general.ent b/general.ent
index 2b51c72e3..d86d566be 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20161009">
+<!ENTITY version         "SVN-20161010">
 <!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        "20161009-systemd">
+<!ENTITY versiond        "20161010-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "Octoberber 9, 2016">
+<!ENTITY releasedate     "October 10, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.11">