Update to systemd-231

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11106 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 37 insertions, 11 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index e3c9f71a6..7b1595964 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
 -->
    <listitem revision="systemd">
+      <para>2016-08-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to systemd-231. Fixes
+          <ulink url="&lfs-ticket-root;3958">#3958</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem revision="systemd">
       <para>2016-08-09</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index a99d936ef..287d78dff 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -43,12 +43,19 @@
 
     <para>Prepare Util-linux for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools                \
+<screen revision="sysv"><userinput remap="configure">./configure --prefix=/tools                \
             --without-python               \
             --disable-makeinstall-chown    \
             --without-systemdsystemunitdir \
             PKG_CONFIG=""</userinput></screen>
 
+<screen revision="systemd"><userinput remap="configure">./configure --prefix=/tools                   \
+            --without-python                  \
+            --disable-makeinstall-chown       \
+            --without-systemdsystemunitdir    \
+            --enable-libmount-force-mountinfo \
+            PKG_CONFIG=""</userinput></screen>
+
     <variablelist>
       <title>The meaning of the configure option:</title>
 
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 672c839bc..23e01d541 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -45,11 +45,13 @@
 
 <screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
 
+<!-- Not needed as of 231. -renodr
     <para>Fix a potential security issue with framebuffer devices:</para>
 
 <screen><userinput remap="pre">sed -e 's@DRI and frame buffer@DRI@'                  \
     -e '/SUBSYSTEM==\"graphics\", KERNEL==\"fb\*\"/d' \
     -i  src/login/70-uaccess.rules</userinput></screen>
+-->
 
     <para>Disable two tests that always fail:</para>
 
@@ -192,7 +194,7 @@ EOF</userinput></screen>
 
 <screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
 
-    <para>Move NSS libraries to <filename class="directory">/lib</filename>:</para>
+    <para>Move the NSS libraries to <filename class="directory">/lib</filename>:</para>
 
 <screen><userinput remap="install">mv -v /usr/lib/libnss_{myhostname,mymachines,resolve}.so.2 /lib</userinput></screen>
 
@@ -219,6 +221,10 @@ 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 -v /etc/resolv.conf
+ln -s ../lib/systemd/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
@@ -248,7 +254,8 @@ make LD_LIBRARY_PATH=/tools/lib -k check</userinput></screen>
         systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent,
         telinit, timedatectl, and udevadm</seg>
         <seg>libnss_myhostname.so.2, libnss_mymachines.so.2,
-        libnss_resolve.so.2, libsystemd.so, and libudev.so</seg>
+        libnss_resolve.so.2, libsystemd.so, libsystemd-shared-231.so,
+        and libudev.so</seg>
         <seg>/etc/binfmt.d, /etc/init.d, /etc/kernel, /etc/modules-load.d,
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index f4a7c5640..b5163ce3b 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -86,7 +86,8 @@
             --disable-runuser    \
             --disable-pylibmount \
             --disable-static     \
-            --without-python</userinput></screen>
+            --without-python     \
+            --enable-libmount-force-mountinfo</userinput></screen>
 
     <para>The --disable and --without options prevent warnings about
     building components that require packages not in LFS or are 
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index 3818a7b83..0df3de5a5 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -33,6 +33,7 @@ NAME="Linux From Scratch"
 VERSION="&versiond;"
 ID=lfs
 PRETTY_NAME="Linux From Scratch &versiond;"
+VERSION_CODENAME="&lt;your name here&gt;"
 EOF</userinput></screen>
 
   <para revision="sysv">It may be a good idea to create an
diff --git a/general.ent b/general.ent
index cbffce239..a8d32b07a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,9 +1,9 @@
-<!ENTITY version         "SVN-20160809">
+<!ENTITY version         "SVN-20160811">
 <!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        "20160809-systemd">
+<!ENTITY versiond        "20160811-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
diff --git a/packages.ent b/packages.ent
index af61289d9..d1bacee17 100644
--- a/packages.ent
+++ b/packages.ent
@@ -549,13 +549,13 @@
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version "230">
-<!ENTITY systemd-size    "3,748 KB">
+<!ENTITY systemd-version "231">
+<!ENTITY systemd-size    "3,840 KB">
 <!ENTITY systemd-url     "http://anduin.linuxfromscratch.org/sources/other/systemd/systemd-&systemd-version;.tar.xz">
-<!ENTITY systemd-md5     "7fd9c7b1296104ccc0b8aee4be3d3c23">
+<!ENTITY systemd-md5     "2647855c8f9cdf824953f1091db2d2b2">
 <!ENTITY systemd-home    "http://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-ch6-du  "1.0 GB">
-<!ENTITY systemd-ch6-sbu "4.9 SBU">
+<!ENTITY systemd-ch6-du  "430 MB">
+<!ENTITY systemd-ch6-sbu "6.7 SBU">
 
 <!ENTITY sysvinit-version "2.88dsf">
 <!ENTITY sysvinit-size "108 KB">