From 323c6723c98b1f97a1253591a8f1548766ad68de Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 3 Mar 2013 16:11:07 +0000
Subject: [PATCH] Improve the tagging and placement of some post install
 instructions for DBus and Systemd.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd/BOOK@10185 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter06/dbus.xml      |  2 +-
 chapter06/systemd.xml   | 12 ++++++------
 general.ent             |  4 ++--
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 345dfaf98..bcc740161 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2013-03-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Improve the tagging and placement of some post
+          install instructions for DBus and Systemd. Thanks to Pierre Labastie
+          for the report.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2013-03-01</para>
       <itemizedlist>
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 1583729f4..ae25af488 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -78,7 +78,7 @@
 
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install
+<screen><userinput>make install
 dbus-uuidgen --ensure</userinput></screen>
 
   </sect2>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 3a2f49236..85b4886c3 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -105,11 +105,6 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Create the <filename>/etc/machine-id</filename> file needed by
-    Journald:</para>
-
-<screen><userinput remap="install">systemd-machine-id-setup</userinput></screen>
-
     <para>Create the Sysvinit compatibility symlinks, so Systemd is used
     as the default init system:</para>
 
@@ -125,10 +120,15 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 
 <screen><userinput remap="install">mkdir -pv /var/log/journal</userinput></screen>
 
-    <para>Remove reference to a non-existent group:</para>
+    <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>
 
+    <para>Create the <filename>/etc/machine-id</filename> file needed by
+    Journald:</para>
+
+<screen><userinput>systemd-machine-id-setup</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-systemd" role="content">
diff --git a/general.ent b/general.ent
index df4b4af7b..92dab299a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20130302">
-<!ENTITY releasedate "March 2, 2013">
+<!ENTITY version "SYSTEMD-20130303">
+<!ENTITY releasedate "March 3, 2013">
 <!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->