From a840e5905d8d2906120b5a8a9d6a06c987727d98 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Fri, 12 Aug 2016 02:02:09 +0000
Subject: Update to systemd-231

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11106 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/systemd.xml    | 11 +++++++++--
 chapter06/util-linux.xml |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'chapter06')

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 
-- 
cgit v1.2.3-54-g00ecf