From ab6f6bb677cc0436c7f7502e0b8691787727d8ea Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 3 Mar 2013 19:34:48 +0000
Subject: [PATCH] Have DBus use the same machine-id file as Systemd

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10187 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter06/dbus.xml      | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index bcc740161..2cab81d07 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2013-03-03</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Have DBus use the same
+          <filename>machine-id</filename> file as Systemd.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Improve the tagging and placement of some post
           install instructions for DBus and Systemd. Thanks to Pierre Labastie
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index ae25af488..b38ad86d5 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -78,8 +78,12 @@
 
     <para>Install the package:</para>
 
-<screen><userinput>make install
-dbus-uuidgen --ensure</userinput></screen>
+<screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Create a symlink, so that DBus and Systemd can use the same
+    <filename>machine-id</filename> file:</para>
+
+<screen><userinput>ln -s /etc/machine-id /var/lib/dbus</userinput></screen>
 
   </sect2>