Fix systemd chapter 6 build, move util-linux back to end of chapter 6, remove sysmlink for /etc/resolv.conf

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10985 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 51 insertions, 37 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 481c9938c..8d6883cb0 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -420,7 +420,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man-DB, and Udev</seg>
+          <seg>Bash, Diffutils, Findutils, Man-DB, and Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2271,7 +2271,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make, Ncurses, Sed, Udev, and Zlib</seg>
+         Gettext, Glibc, Grep, Make, Ncurses, Sed, Systemd, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2393,7 +2393,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>GRUB, Kmod, Man-DB, Udev</seg>
+          <seg>GRUB, Kmod, Man-DB, Systemd</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a37bdd83c..d0676e951 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,21 @@
 -->
 
     <listitem>
+      <para>2016-01-02</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Fix build of systemd with libblkid and libmount in
+          /tools/lib and move util-linux to its previous build order to
+          solve reciprocal dependency.</para>
+        </listitem>
+        <listitem>
+          <para>[dj] - Removed /etc/resolv.conf symlink in network
+          configuration as it is created automatically if needed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2016-01-01</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index ddfd2c853..d08135f7e 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -58,7 +58,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
@@ -76,6 +75,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 7a2f821ea..17ddda598 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -40,7 +40,29 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
 
-    <para>First, create a file to allow systemd to build when using Util-Linux
+    <para>First, fix a build error when using Util-Linux built in
+    Chapter 5:</para>
+
+<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
+
+    <para>Apply the following patch so that compat
+    <command>pkg-config</command> files get installed without installing compat
+    libs which are useless on LFS:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
+
+    <para>Disable two tests that always fail:</para>
+
+<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
+    -e 's:test-copy$(EXEEXT) ::g' \
+    -i Makefile.in</userinput></screen>
+
+    <para>Rebuild generated files after modifying Makefile.am and 
+    Makefile.in:</para>
+
+<screen><userinput remap="pre">autoreconf -fi</userinput></screen>
+
+    <para>Create a file to allow systemd to build when using Util-Linux
     built in Chapter 5, to disable LTO by default, and to build without
     xlstproc:</para>
 
@@ -58,26 +80,10 @@ cc_cv_CFLAGS__flto=no
 XSLTPROC="/usr/bin/xsltproc"</literal>
 EOF</userinput></screen>
 
-    <para>LTO is disabled by default because it causes <command>systemd</command>
-    and other auxiliary programs to link to <filename
-    class="libraryfile">libgcc_s.so</filename>, slows the build down and makes the
-    compiled code larger.</para>
-
-    <para>Additionally, fix a build error when using Util-Linux built in
-    Chapter 5:</para>
-
-<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
-
-    <para>Apply the following patch so that compat <command>pkg-config</command> files
-    get installed without installing compat libs which are useless on LFS:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
-
-    <para>Disable two tests that always fail:</para>
-
-<screen><userinput remap="pre">sed -e 's:test/udev-test.pl ::g'  \
-    -e 's:test-copy$(EXEEXT) ::g' \
-    -i Makefile.in</userinput></screen>
+    <para>LTO is disabled by default because it causes
+    <command>systemd</command> and other auxiliary programs to link to
+    <filename class="libraryfile">libgcc_s.so</filename>, slows the build down
+    and makes the compiled code larger.</para>
 
     <para>Prepare systemd for compilation:</para>
 
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 7dc86cbf5..39055a8ca 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -115,16 +115,9 @@ EOF</userinput></screen>
 
       <para>When using <command>systemd-resolved</command> for DNS
       configuration, it is responsible for creating the
-      <filename>/etc/resolv.conf</filename> file, which is placed in a
-      non-standard location that is writable during early boot. In order to be
-      used by other components of the system, it is necessary to create a
-      symlink with 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>
+      <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>
 
     </sect3>
 
diff --git a/general.ent b/general.ent
index 0df651f32..9b3cd7d97 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160101-systemd">
+<!ENTITY version         "20160102-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "January 1, 2016">
+<!ENTITY releasedate     "January 2, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->