From 4322222ddb1eb759de62039b22e4f2d16baf45e3 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 14 Oct 2012 06:18:31 +0000
Subject: [PATCH] Remove utmpdump from sysvinit because it is now installed by
 util-linux.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10020 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  6 ++++++
 chapter06/sysvinit.xml  | 22 +++++-----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ab03a749f..c287c346d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
     <listitem>
       <para>2012-09-27</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Remove utmpdump from sysvinit 
+          because it is now installed by util-linux.  Thanks to
+          Chris Staub for the patch.  Fixes
+          <ulink url="&lfs-ticket-root;3202">#3202</ulink>.</para> 
+        </listitem>
         <listitem>
           <para>[bdubbs] - Change procps to not install the
           kill program that is now installed by util-linux.  Fixes
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 2acf8972d..b1b85c6b9 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -54,14 +54,13 @@
 
 <screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' src/init.c</userinput></screen>
 
-    <para>Maintained versions of the <command>wall</command> and 
-    <command>mountpoint</command> programs were
+    <para>Maintained versions of the <command>wall</command>,
+    <command>mountpoint</command>, and <command>utmpdump</command> programs were
     installed earlier by Util-linux. Suppress the installation of Sysvinit's
     versions of these programs and their man pages:</para>
 
-<screen><userinput remap="make">sed -i -e 's/utmpdump wall/utmpdump/' \
-       -e '/= mountpoint/d' \
-       -e 's/mountpoint.1 wall.1//' src/Makefile</userinput></screen>
+<screen><userinput remap="make">sed -i -e '/utmpdump/d' \
+       -e '/mountpoint/d' src/Makefile</userinput></screen> 
 
     <para>Compile the package:</para>
 
@@ -85,7 +84,7 @@
         <seg>bootlogd, fstab-decode, halt, init, killall5, last, 
         lastb (link to last), mesg, pidof (link to killall5),
         poweroff (link to halt), reboot (link to halt), runlevel, shutdown,
-        sulogin, telinit (link to init), and utmpdump</seg>
+        sulogin, and telinit (link to init)</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -262,17 +261,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="utmpdump">
-        <term><command>utmpdump</command></term>
-        <listitem>
-          <para>Displays the content of the given login file in a more
-          user-friendly format</para>
-          <indexterm zone="ch-system-sysvinit utmpdump">
-            <primary sortas="b-utmpdump">utmpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>