Supress sysvinit overwriting mountpoint from util-linux

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9594 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

4 files changed, 28 insertions, 16 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index eb51a263f..086cb928f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
     <listitem>
+      <para>2011-09-04</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Supress sysvinit overwriting mountpoint from util-linux.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2011-09-03</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 2fac8e4ff..09ef2c7be 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -55,12 +55,14 @@
 <screen><userinput remap="pre">sed -i 's@Sending processes@&amp; configured via /etc/inittab@g' \
     src/init.c</userinput></screen>
 
-    <para>A maintained version of the <command>wall</command> program was
+    <para>Maintained versions of the <command>wall</command> and 
+    <command>mountpoint</command> programs were
     installed earlier by Util-linux. Suppress the installation of Sysvinit's
-    version of this program and its man page:</para>
+    versions of these programs and their man pages:</para>
 
 <screen><userinput remap="make">sed -i -e 's/utmpdump wall/utmpdump/' \
-       -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile</userinput></screen>
+       -e '/= mountpoint/d' \
+       -e 's/mountpoint.1 wall.1//' src/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -186,16 +188,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="mountpoint">
-        <term><command>mountpoint</command></term>
-        <listitem>
-          <para>Checks if the directory is a mountpoint</para>
-          <indexterm zone="ch-system-sysvinit mountpoint">
-            <primary sortas="b-mountpoint">mountpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="pidof">
         <term><command>pidof</command></term>
         <listitem>
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 43c8b47ae..8a85a3bba 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -113,7 +113,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock, i386,
         ionice, ipcmk, ipcrm, ipcs, isosize, ldattach, line, linux32, linux64,
         logger, look, losetup, lsblk, lscpu, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
-        mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
+        mkfs.minix, mkswap, more, mount, mountpoint, namei, partx, pg, pivot_root,
         readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
         setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
         swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare,
@@ -699,6 +699,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="mountpoint">
+        <term><command>mountpoint</command></term>
+        <listitem>
+          <para>Checks if the directory is a mountpoint</para>
+          <indexterm zone="ch-system-util-linux mountpoint">
+            <primary sortas="b-mountpoint">mountpoint</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="namei">
         <term><command>namei</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index c9b2f92aa..4233b6514 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110903">
-<!ENTITY releasedate "Sep 3, 2011">
+<!ENTITY version "SVN-20110904">
+<!ENTITY releasedate "Sep 4, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->