Converted util-linux to new layout.

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

5 files changed, 44 insertions, 8 deletions

diff --git a/appendixa/utillinux-dep.xml b/appendixa/utillinux-dep.xml
index 6cedb0f00..18547d80e 100644
--- a/appendixa/utillinux-dep.xml
+++ b/appendixa/utillinux-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Util-linux Installation Dependencies</title>
 
diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml
new file mode 100644
index 000000000..dae3704d3
--- /dev/null
+++ b/appendixa/utillinux-shortdesc.xml
@@ -0,0 +1,21 @@
+<sect2><title>Contents of Util-linux</title>
+
+<para>Last checked against version &util-linux-contversion;.</para>
+
+<para>The Util-linux package contains a number of miscellaneous
+utility programs. Some of the more prominent utilities are used
+to mount, unmount, format, partition and manage disk drives,
+open tty ports and fetch kernel messages.</para>
+
+<sect3><title>Program Files</title>
+<para>agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
+colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk,
+fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ipcrm, ipcs, isosize, line, logger,
+look, losetup, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount,
+namei, parse.bash, parse.tcsh, pg, pivot_root, ramsize (link to rdev),
+raw, rdev, readprofile, rename, renice, rev, rootflags (link to rdev),
+script, setfdprm, setsid, setterm, sfdisk, swapoff (link to swapon), swapon,
+test.bash, test.tcsh, tunelp, ul, umount, vidmode (link to rdev), whereis
+and write</para></sect3>
+
+</sect2>
diff --git a/chapter05/utillinux-inst.xml b/chapter05/utillinux-inst.xml
index 12e22e833..364a65e1f 100644
--- a/chapter05/utillinux-inst.xml
+++ b/chapter05/utillinux-inst.xml
@@ -1,15 +1,26 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
 <sect2>
 <title>Installation of Util-linux</title>
 
-<para>We only need the mount and umount programs at the moment, so we won't
-be compiling the entire package.</para>
+<para>Prepare Util-linux to be compiled:</para>
+
+<para><screen><userinput>LDFLAGS="-static" ./configure</userinput></screen></para>
+
+<para>Begin compiling the package:</para>
+
+<para><screen><userinput>make -C lib</userinput></screen></para>
+
+<para>We only need the <emphasis>mount</emphasis> and
+<emphasis>umount</emphasis> programs at the moment, so we won't be
+compiling the entire package. Compile these two programs by issuing
+the following command:</para>
+
+<para><screen><userinput>make -C mount mount umount</userinput></screen></para>
 
-<para>Install Util-linux by running the following commands:</para>
+<para>Finish installing these two programs:</para>
 
-<para><screen><userinput>LDFLAGS="-static" ./configure &amp;&amp;
-make -C lib &amp;&amp;
-make -C mount mount umount &amp;&amp;
-cp mount/{mount,umount} $LFS/static/bin</userinput></screen></para>
+<para><screen><userinput>cp mount/{mount,umount} $LFS/static/bin</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index c9b291818..059dca15b 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -5,7 +5,8 @@
 <screen>Estimated build time:           &util-linux-time-static;
 Estimated required disk space:  &util-linux-compsize-static;</screen>
 
-&c5-utillinux-inst;
+&aa-utillinux-shortdesc;
 &aa-utillinux-dep;
+&c5-utillinux-inst;
 
 </sect1>
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index 36ae68cbf..f78542123 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -11,6 +11,7 @@
 <!ENTITY aa-utillinux-desc SYSTEM "../appendixa/utillinux-desc.xml">
 <!ENTITY aa-utillinux-dep SYSTEM "../appendixa/utillinux-dep.xml">
 <!ENTITY aa-utillinux-down SYSTEM "../appendixa/utillinux-down.xml">
+<!ENTITY aa-utillinux-shortdesc SYSTEM "../appendixa/utillinux-shortdesc.xml">
 
 <!ENTITY util-linux-version "2.11y">
 <!ENTITY util-linux-depversion "2.11n">