Added descriptions of symlinks created by util-linux.

Move gawk ahead of findutils to avoid a test suite failure in chapter 6.

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

2 files changed, 37 insertions, 8 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 93d643fbc..0f079bf50 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -44,10 +44,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="groff.xml"/>
diff --git a/chapter06/util-linux-ng.xml b/chapter06/util-linux-ng.xml
index ebe43640c..258c7b897 100644
--- a/chapter06/util-linux-ng.xml
+++ b/chapter06/util-linux-ng.xml
@@ -105,16 +105,15 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
       <segtitle>Installed programs</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, ionice, ipcrm, ipcs, isosize, ldattach, line, 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,
-        swapon, tailf, taskset, tunelp, ul, umount, wall, whereis,
-        and write</seg>
+        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, swapon, tailf, taskset, tunelp, ul,
+        umount, wall, whereis, and write</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -385,6 +384,16 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="i386">
+        <term><command>i386</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux-ng i386">
+            <primary sortas="b-i386">i386</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="ionice">
         <term><command>ionice</command></term>
         <listitem>
@@ -435,6 +444,26 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="linux32">
+        <term><command>linux32</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux-ng linux32">
+            <primary sortas="b-linux32">linux32</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="linux64">
+        <term><command>linux64</command></term>
+        <listitem>
+          <para>A symbolic link to setarch</para>
+          <indexterm zone="ch-system-util-linux-ng linux64">
+            <primary sortas="b-linux64">linux64</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="line">
         <term><command>line</command></term>
         <listitem>