Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision f6125f3c3c681439437149fdd10d6e989c262323)
+++ chapter06/chapter06.xml	(revision 5bbc896095469381ba24fe49d2c2ed449c05d3cf)
@@ -74,5 +74,4 @@
   <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="libdbus.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="dbus.xml"/>
Index: chapter06/libdbus.xml
===================================================================
--- chapter06/libdbus.xml	(revision f6125f3c3c681439437149fdd10d6e989c262323)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libdbus" role="wrap">
-  <?dbhtml filename="libdbus.html"?>
-
-  <sect1info condition="script">
-    <productname>libdbus</productname>
-    <productnumber>&dbus-version;</productnumber>
-    <address>&dbus-url;</address>
-  </sect1info>
-
-  <title>Libdbus-&dbus-version;</title>
-
-  <indexterm zone="ch-system-libdbus">
-    <primary sortas="a-libdbus">Libdbus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Libdbus package provides a library to communicate with
-    D-Bus messagebus daemon. It is only installed to satisfy
-    circular dependency between Systemd and D-Bus.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&dbus-ch6-sbu;</seg>
-        <seg>&dbus-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdbus</title>
-
-    <note>
-      <para><application>Libdbus</application> is part of the D-Bus sources.
-      You should first unpack the D-Bus tarball and change to the
-      <filename>dbus-&dbus-version;</filename> directory.</para>
-    </note>
-
-    <para>Prepare Libdbus for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --localstatedir=/var</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make -C dbus libdbus-1.la</userinput></screen>
-
-    <para>This package does come with a testsuite, but it is not
-    possible to run it because only part of the package was
-    built.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make -C dbus lib_LTLIBRARIES=libdbus-1.la \
-     install-libLTLIBRARIES \
-     install-dbusincludeHEADERS \
-     install-nodist_dbusarchincludeHEADERS
-make install-pkgconfigDATA</userinput></screen>
-
-    <para>The shared library needs to be moved to
-    <filename class="directory">/lib</filename>, and as a result the
-    <filename class="extension">.so</filename> file in
-    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
-
-<screen><userinput remap="install">mv -v /usr/lib/libdbus-1.so.* /lib
-ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
-
-
-  </sect2>
-
-  <sect2 id="contents-libdbus" role="content">
-    <title>Contents of Libdbus</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>libdbus-1.{a,so}</seg>
-        <seg>/usr/include/dbus-1.0, /usr/lib/dbus-1.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdbus-1">
-        <term><filename class="libraryfile">libdbus-1</filename></term>
-        <listitem>
-          <para>Contains API functions used to communicate with the D-Bus
-          message bus.</para>
-          <indexterm zone="ch-system-libdbus libdbus-1">
-            <primary sortas="c-libdbus">libdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: chapter06/systemd.xml
===================================================================
--- chapter06/systemd.xml	(revision f6125f3c3c681439437149fdd10d6e989c262323)
+++ chapter06/systemd.xml	(revision 5bbc896095469381ba24fe49d2c2ed449c05d3cf)
@@ -54,18 +54,27 @@
     Chapter 5:</para>
 
-<screen><userinput remap="pre">sed -i "s:blkid/::" src/udev/udev-builtin-blkid.c</userinput></screen>
+<screen><userinput remap="pre">sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")</userinput></screen>
+
+    <para>Apply a 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>Prepare Systemd for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc                   \
-            --localstatedir=/var                \
-            --docdir=/usr/share/doc/systemd-&systemd-version; \
-            --config-cache                      \
-            --with-rootprefix=                  \
-            --with-rootlibdir=/lib              \
-            --enable-split-usr                  \
-            --disable-gudev                     \
-            --without-python</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr                                           \
+            --sysconfdir=/etc                                       \
+            --localstatedir=/var                                    \
+            --config-cache                                          \
+            --with-rootprefix=                                      \
+            --with-rootlibdir=/lib                                  \
+            --enable-split-usr                                      \
+            --disable-gudev                                         \
+            --without-python                                        \
+            --docdir=/usr/share/doc/systemd-&systemd-version;                     \
+            --with-dbuspolicydir=/etc/dbus-1/system.d               \
+            --with-dbusinterfacedir=/usr/share/dbus-1/interfaces    \
+            --with-dbussessionservicedir=/usr/share/dbus-1/services \
+            --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
 
     <variablelist>
@@ -107,4 +116,12 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--with-dbus*</parameter></term>
+        <listitem>
+          <para>These switches ensure that D-Bus configuratil files
+          get installed in the correct locations.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
@@ -113,26 +130,22 @@
 <screen><userinput remap="make">make LIBRARY_PATH=/tools/lib</userinput></screen>
 
-    <para>The package comes with a testsuite, but it doesn't work in
-    chroot. It needs to be run from a system booted using Systemd.</para>
-
-    <para>First prevent a broken test case from running:</para>
-
-<screen><userinput remap="test">sed -i s:test/udev-test.pl::g Makefile</userinput></screen>
+    <para>First prevent few broken test cases from running:</para>
+
+<screen><userinput remap="test">sed -e "s:test/udev-test.pl::g"            \
+    -e "s:test-bus-cleanup\$(EXEEXT) ::g"  \
+    -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
+    -i Makefile</userinput></screen>
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make -k check</userinput></screen>
+
+    <para>Note that some tests might fail because the test are being run in a
+    chroot environment. For full test coverage, the test suite should be ran
+    from a system booted using Systemd.</para>
 
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
-
-    <para>Install manual pages which are shipped in the tarball, but were
-    not installed by install process:</para>
-
-<screen><userinput remap="install">for cat in 1 3 5 7 8
-do
-  install -v -m644 man/*.${cat} /usr/share/man/man${cat}
-done</userinput></screen>
 
     <para>Move NSS myhostname library to <filename
@@ -155,5 +168,5 @@
     <para>Remove a reference to a non-existent group:</para>
 
-<screen><userinput remap="install">sed -i "s@0775 root lock@0755 root root@g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
+<screen><userinput remap="install">sed -i "s:0775 root lock:0755 root root:g" /usr/lib/tmpfiles.d/legacy.conf</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
@@ -173,13 +186,13 @@
 
       <seglistitem>
-        <seg>bootctl, halt, hostnamectl, init, journalctl, kernel-install, localectl,
-        loginctl, machinectl, poweroff, reboot, runlevel, shutdown, systemctl,
-        systemd-analyze, systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-coredumpctl, systemd-delta, systemd-detect-virt, systemd-inhibit,
-        systemd-machine-id-setup, systemd-notify, systemd-nspawn, systemd-run,
-        systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent, telinit,
-        timedatectl, and udevadm</seg>
-        <seg>libnss_myhostname.so.2, libsystemd-daemon.so, libsystemd-id128.so,
-        libsystemd-journal.so, libsystemd-login.so, libudev.so</seg>
+        <seg>bootctl, busctl, halt, hostnamectl, init, journalctl, kernel-install,
+        localectl, loginctl, machinectl, poweroff, reboot, runlevel, shutdown,
+        systemctl, systemd-analyze, systemd-ask-password, systemd-cat, systemd-cgls,
+        systemd-cgtop, systemd-coredumpctl, systemd-delta, systemd-detect-virt,
+        systemd-inhibit, systemd-machine-id-setup, systemd-notify, systemd-nspawn,
+        systemd-run, systemd-stdio-bridge, systemd-tmpfiles, systemd-tty-ask-password-agent,
+        telinit, timedatectl, and udevadm</seg>
+
+        <seg>libnss_myhostname.so.2, libsystemd.so, 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,
@@ -197,13 +210,23 @@
       <?dbhtml list-presentation="table"?>
 
-<!--      <varlistentry id="bootctl">
+      <varlistentry id="bootctl">
         <term><command>bootctl</command></term>
         <listitem>
-          <para></para>
+          <para>used to query the firmware and boot manager settings.</para>
           <indexterm zone="ch-system-systemd bootctl">
             <primary sortas="b-bootctl">bootctl</primary>
           </indexterm>
         </listitem>
-      </varlistentry> -->
+      </varlistentry>
+
+      <varlistentry id="busctl">
+        <term><command>busctl</command></term>
+        <listitem>
+          <para>used to introspect and monitor the D-Bus bus.</para>
+          <indexterm zone="ch-system-systemd busctl">
+            <primary sortas="b-busctl">busctl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="halt">
@@ -561,40 +584,10 @@
       </varlistentry>
 
-      <varlistentry id="libsystemd-daemon">
-        <term><filename class="libraryfile">libsystemd-daemon</filename></term>
-        <listitem>
-          <para>Systemd Daemon utility library.</para>
-          <indexterm zone="ch-system-systemd libsystemd-daemon">
-            <primary sortas="c-libsystemd-daemon">libsystemd-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsystemd-id128">
-        <term><filename class="libraryfile">libsystemd-id128</filename></term>
-        <listitem>
-          <para>Systemd 128 Bit ID utility library.</para>
-          <indexterm zone="ch-system-systemd libsystemd-id128">
-            <primary sortas="c-libsystemd-id128">libsystemd-id128</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsystemd-journal">
-        <term><filename class="libraryfile">libsystemd-journal</filename></term>
-        <listitem>
-          <para>Systemd Journal utility library.</para>
-          <indexterm zone="ch-system-systemd libsystemd-journal">
-            <primary sortas="c-libsystemd-journal">libsystemd-journal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsystemd-login">
-        <term><filename class="libraryfile">libsystemd-login</filename></term>
-        <listitem>
-          <para>Systemd Login utility library.</para>
-          <indexterm zone="ch-system-systemd libsystemd-login">
-            <primary sortas="c-libsystemd-login">libsystemd-login</primary>
+      <varlistentry id="libsystemd">
+        <term><filename class="libraryfile">libsystemd</filename></term>
+        <listitem>
+          <para>Systemd utility library.</para>
+          <indexterm zone="ch-system-systemd libsystemd">
+            <primary sortas="c-libsystemd">libsystemd</primary>
           </indexterm>
         </listitem>
