Update list of intalled programs and libraries for Util-Linux-NG & E2fsprogs, and update dependency info. Thanks to Chris Staub for the patch. Fixes #2444.

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

3 files changed, 128 insertions, 73 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 624b35aaf..b2ed94953 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -215,7 +215,7 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils, E2fsprogs</seg>
+          <seg>Diffutils, E2fsprogs, Findutils, and Util-linux-ng</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -318,7 +318,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
-         Make, Sed, and Texinfo</seg>
+         Make, Pkg-config, Sed, Texinfo, and Util-linux-ng</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -334,7 +334,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Util-linux-ng</seg>
+          <seg>None</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1432,7 +1432,7 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Gettext, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
          Make, Ncurses, Patch, Sed, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 2d5860689..b44d4d63b 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -153,11 +153,11 @@ install-info --dir-file=/usr/share/info/dir \
       <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
-        <seg>badblocks, blkid, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
-        e2image, e2initrd_helper, e2label, e2undo, filefrag, findfs, fsck,
-        fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
-        mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
-        mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg>
+        <seg>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
+        e2image, e2initrd_helper, e2label, e2undo, filefrag, fsck.ext2,
+        fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr, mk_cmds, mke2fs,
+        mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev, mklost+found,
+        resize2fs, and tune2fs</seg>
         <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so} and
         libss.{a,so}</seg>
       </seglistitem>
@@ -179,17 +179,6 @@ install-info --dir-file=/usr/share/info/dir \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="blkid">
-        <term><command>blkid</command></term>
-        <listitem>
-          <para>A command line utility to locate and print block device
-          attributes</para>
-          <indexterm zone="ch-system-e2fsprogs blkid">
-            <primary sortas="b-blkid">blkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="chattr">
         <term><command>chattr</command></term>
         <listitem>
@@ -307,27 +296,6 @@ install-info --dir-file=/usr/share/info/dir \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="findfs">
-        <term><command>findfs</command></term>
-        <listitem>
-          <para>Finds a file system by label or Universally Unique Identifier
-          (UUID)</para>
-          <indexterm zone="ch-system-e2fsprogs findfs">
-            <primary sortas="b-findfs">findfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck">
-        <term><command>fsck</command></term>
-        <listitem>
-          <para>Is used to check, and optionally repair, file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck">
-            <primary sortas="b-fsck">fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="fsck.ext2">
         <term><command>fsck.ext2</command></term>
         <listitem>
@@ -497,29 +465,6 @@ install-info --dir-file=/usr/share/info/dir \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="uuidd">
-        <term><command>uuidd</command></term>
-        <listitem>
-          <para>A daemon used by the UUID library to generate time-based
-          UUIDs in a secure and guranteed-unique fashion.</para>
-          <indexterm zone="ch-system-e2fsprogs uuidd">
-            <primary sortas="b-uuidd">uuidd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidgen">
-        <term><command>uuidgen</command></term>
-        <listitem>
-          <para>Creates new UUIDs. Each new UUID can reasonably be considered
-          unique among all UUIDs created, on the local system and on other
-          systems, in the past and in the future</para>
-          <indexterm zone="ch-system-e2fsprogs uuidgen">
-            <primary sortas="b-uuidgen">uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libcom_err">
         <term><filename class="libraryfile">libcom_err</filename></term>
         <listitem>
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index bccd6eb88..ec08257a1 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -103,17 +103,20 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
 
     <segmentedlist>
       <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
 
       <seglistitem>
-        <seg>addpart, agetty, arch, blockdev, cal, cfdisk, chkdupexe, chrt,
-        col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart, dmesg,
-        fdformat, fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump,
-        hwclock, i386,  ionice, ipcrm, ipcs, isosize, ldattach, line, linux32,
-        linux64, logger, look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs,
-        mkfs.minix, mkswap, more, mount, namei, partx, pg, pivot_root,
-        readprofile, rename, renice, rev, rtcwake, script, scriptreplay,
-        setarch, setsid, setterm, sfdisk, swapoff (link to swapon), swapon,
-        tailf, taskset, tunelp, ul, umount, wall, whereis, and write</seg>
+        <seg>addpart, agetty, arch, blkid, blockdev, cal, cfdisk, chkdupexe,
+        chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, delpart,
+        dmesg, fdformat, fdisk, findfs, flock, fsck, fsck.cramfs, fsck.minix,
+        getopt, hexdump, hwclock, i386, ionice, ipcmk, ipcrm, ipcs, isosize,
+        ldattach, line, linux32, linux64, logger, look, losetup, lscpu,
+        mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount,
+        namei, partx, pg, pivot_root, readprofile, rename, renice, rev,
+        rtcwake, script, scriptreplay, setarch, setsid, setterm, sfdisk,
+        swapoff (link to swapon), swapon, switch_root, tailf, taskset, tunelp,
+        ul, umount, uuidd, uuidgen, wall, whereis, and write</seg>
+        <seg>libblkid.{a,so}, libuuid.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -153,6 +156,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="blkid">
+        <term><command>blkid</command></term>
+        <listitem>
+          <para>A command line utility to locate and print block device
+          attributes</para>
+          <indexterm zone="ch-system-e2fsprogs blkid">
+            <primary sortas="b-blkid">blkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="blockdev">
         <term><command>blockdev</command></term>
         <listitem>
@@ -318,6 +332,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="findfs">
+        <term><command>findfs</command></term>
+        <listitem>
+          <para>Finds a file system by label or Universally Unique Identifier
+          (UUID)</para>
+          <indexterm zone="ch-system-e2fsprogs findfs">
+            <primary sortas="b-findfs">findfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="flock">
         <term><command>flock</command></term>
         <listitem>
@@ -329,6 +354,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="fsck">
+        <term><command>fsck</command></term>
+        <listitem>
+          <para>Is used to check, and optionally repair, file systems</para>
+          <indexterm zone="ch-system-e2fsprogs fsck">
+            <primary sortas="b-fsck">fsck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="fsck.cramfs">
         <term><command>fsck.cramfs</command></term>
         <listitem>
@@ -404,6 +439,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="ipcmk">
+        <term><command>ipcmk</command></term>
+        <listitem>
+          <para>Creates various IPC resources</para>
+          <indexterm zone="ch-system-util-linux-ng ipcmk">
+            <primary sortas="b-ipcmk">ipcmk</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ipcrm">
         <term><command>ipcrm</command></term>
         <listitem>
@@ -504,6 +549,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="lscpu">
+        <term><command>lscpu</command></term>
+        <listitem>
+          <para>Prints CPU architechture information</para>
+          <indexterm zone="ch-system-util-linux-ng lscpu">
+            <primary sortas="b-lscpu">lscpu</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="mcookie">
         <term><command>mcookie</command></term>
         <listitem>
@@ -764,6 +819,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="switch_root">
+        <term><command>switch_root</command></term>
+        <listitem>
+          <para>Switches to another filesystem as the root of the mount tree</para>
+          <indexterm zone="ch-system-util-linux-ng switch_root">
+            <primary sortas="b-switch_root">switch_root</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="tailf">
         <term><command>tailf</command></term>
         <listitem>
@@ -817,6 +882,29 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="uuidd">
+        <term><command>uuidd</command></term>
+        <listitem>
+          <para>A daemon used by the UUID library to generate time-based
+          UUIDs in a secure and guranteed-unique fashion.</para>
+          <indexterm zone="ch-system-e2fsprogs uuidd">
+            <primary sortas="b-uuidd">uuidd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="uuidgen">
+        <term><command>uuidgen</command></term>
+        <listitem>
+          <para>Creates new UUIDs. Each new UUID can reasonably be considered
+          unique among all UUIDs created, on the local system and on other
+          systems, in the past and in the future</para>
+          <indexterm zone="ch-system-e2fsprogs uuidgen">
+            <primary sortas="b-uuidgen">uuidgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="wall">
         <term><command>wall</command></term>
         <listitem>
@@ -850,6 +938,28 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libblkid">
+        <term><filename class="libraryfile">libblkid</filename></term>
+        <listitem>
+          <para>Contains routines for device identification and token
+          extraction</para>
+          <indexterm zone="ch-system-e2fsprogs libblkid">
+            <primary sortas="c-libblkid">libblkid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libuuid">
+        <term><filename class="libraryfile">libuuid</filename></term>
+        <listitem>
+          <para>Contains routines for generating unique identifiers for objects
+          that may be accessible beyond the local system</para>
+          <indexterm zone="ch-system-e2fsprogs libuuid">
+            <primary sortas="c-libuuid">libuuid</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>