Changeset eb797aa for chapter06

Timestamp:

09/04/2011 03:37:25 PM (13 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

bc3d809

Parents:

64adff3

Message:

Supress sysvinit overwriting mountpoint from util-linux

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

Location:

chapter06

Files:

• sysvinit.xml (modified) (2 diffs)
• util-linux.xml (modified) (2 diffs)

chapter06/sysvinit.xml

@@ -56 +56 @@
     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>
@@ -187 +189 @@
       </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>

chapter06/util-linux.xml

@@ -114 +114 @@
         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),
@@ -700 +700 @@
       </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>