From a063de63ef22d0e2928b0204e02e7501aad079f0 Mon Sep 17 00:00:00 2001
From: Krejzi <krejzi@linuxfromscratch.org>
Date: Fri, 6 Feb 2015 23:33:01 +0000
Subject: Merged trunk, updated to dbus-1.8.14.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10828 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/adjusting.xml |  3 ++-
 chapter06/dbus.xml      | 11 +++++++++++
 chapter06/glibc.xml     |  4 ++--
 chapter06/kmod.xml      |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/adjusting.xml b/chapter06/adjusting.xml
index f6b00971d..df01e9b68 100644
--- a/chapter06/adjusting.xml
+++ b/chapter06/adjusting.xml
@@ -79,7 +79,8 @@ readelf -l a.out | grep ': /lib'</userinput></screen>
 
 <screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
 
-  <para os="k">The output of the last command should be:</para>
+  <para os="k">References to paths that have components with '-linux-gnu' should
+  be ignored, but otherwise the output of the last command should be:</para>
 
 <screen><computeroutput>SEARCH_DIR("/usr/lib")
 SEARCH_DIR("/lib");</computeroutput></screen>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 5f1c9e196..d6978dd00 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -191,6 +191,17 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
         </listitem>
       </varlistentry>
 
+      <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-dbus libdbus-1">
+            <primary sortas="c-libdbus">libdbus</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index e5bd4bcf4..837132c26 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -138,8 +138,8 @@ cd ../glibc-build</userinput></screen>
       </listitem>
 -->
       <listitem>
-        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
-        connection when the test is run.</para>
+        <para>posix/tst-getaddrinfo4 and posix/tst-getaddrinfo5 will always fail 
+        due to not having a network connection when the tests are run.</para>
       </listitem>
 <!--
       <listitem>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index d7231aa7c..82b2ce9b7 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -84,7 +84,7 @@
 
 <screen><userinput remap="install">make install
 
-for target in depmod insmod modinfo modprobe rmmod; do
+for target in depmod insmod lsmod modinfo modprobe rmmod; do
   ln -sv ../bin/kmod /sbin/$target
 done
 
-- 
cgit v1.2.3-54-g00ecf