aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/e2fsprogs-dep.xml2
-rw-r--r--appendixa/e2fsprogs-desc.xml20
-rw-r--r--appendixa/e2fsprogs-shortdesc.xml25
-rw-r--r--appendixa/e2fsprogs.xml1
-rw-r--r--chapter06/e2fsprogs-inst.xml46
-rw-r--r--chapter06/e2fsprogs.xml5
-rw-r--r--entities/e2fsprogs.ent2
7 files changed, 77 insertions, 24 deletions
diff --git a/appendixa/e2fsprogs-dep.xml b/appendixa/e2fsprogs-dep.xml
index 53f17eb05..e289153f7 100644
--- a/appendixa/e2fsprogs-dep.xml
+++ b/appendixa/e2fsprogs-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>E2fsprogs Installation Dependencies</title>
diff --git a/appendixa/e2fsprogs-desc.xml b/appendixa/e2fsprogs-desc.xml
index cd20916c5..1f5eb214d 100644
--- a/appendixa/e2fsprogs-desc.xml
+++ b/appendixa/e2fsprogs-desc.xml
@@ -1,15 +1,10 @@
-<sect2><title>Contents of E2fsprogs</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &e2fsprogs-contversion;.</para>
-
-<sect3><title>Program Files</title>
+<sect2><title>Descriptions</title>
-<para>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
-e2image, e2label, fsck, fsck.ext2, fsck.ext3, lsattr, mk_cmds, mke2fs,
-mkfs.ext2, mkfs.ext3, mklost+found, resize2fs, tune2fs and
-uuidgen</para></sect3>
+<para>Last checked against version &e2fsprogs-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>badblocks</title>
<para>badblocks is used to search for bad blocks on a device (usually a disk
@@ -89,12 +84,7 @@ systems, in the past and in the future.</para></sect4>
</sect3>
-<sect3><title>Library Files</title>
-
-<para>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so], libss.[a,so],
-libuuid.[a,so]</para></sect3>
-
-<sect3><title>Descriptions</title>
+<sect3><title>Library file descriptions</title>
<sect4><title>libcom_err</title>
<para>The common error display routine.</para></sect4>
diff --git a/appendixa/e2fsprogs-shortdesc.xml b/appendixa/e2fsprogs-shortdesc.xml
new file mode 100644
index 000000000..077c37ece
--- /dev/null
+++ b/appendixa/e2fsprogs-shortdesc.xml
@@ -0,0 +1,25 @@
+<sect2><title>Contents of E2fsprogs</title>
+
+<para>Last checked against version &e2fsprogs-contversion;.</para>
+
+<para>E2fsprogs provides the filesystem utilities for use with the
+ ext2 filesystem. It also supports the ext3 filesystem with journaling
+ support.</para>
+
+<para>E2fsprogs installs the following:</para>
+
+<sect3><title>Program Files</title>
+
+<para>badblocks, chattr, compile_et, debugfs, dumpe2fs, e2fsck,
+e2image, e2label, fsck, fsck.ext2, fsck.ext3, lsattr, mk_cmds, mke2fs,
+mkfs.ext2, mkfs.ext3, mklost+found, resize2fs, tune2fs and
+uuidgen</para></sect3>
+
+<sect3><title>Library Files</title>
+
+<para>libcom_err.[a,so], libe2p.[a,so], libext2fs.[a,so], libss.[a,so],
+libuuid.[a,so]</para></sect3>
+
+
+</sect2>
+
diff --git a/appendixa/e2fsprogs.xml b/appendixa/e2fsprogs.xml
index 8b36ee9fe..f5f611cb2 100644
--- a/appendixa/e2fsprogs.xml
+++ b/appendixa/e2fsprogs.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="e2fsprogs.html" dir="appendixa"?>
&aa-e2fsprogs-down;
+&aa-e2fsprogs-shortdesc;
&aa-e2fsprogs-desc;
&aa-e2fsprogs-dep;
diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml
index 0abaafa20..2f42e27e7 100644
--- a/chapter06/e2fsprogs-inst.xml
+++ b/chapter06/e2fsprogs-inst.xml
@@ -1,16 +1,52 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of E2fsprogs</title>
-<para>Install E2fsprogs by running the following commands:</para>
+<para>Prepare E2fsprogs to be compiled:</para>
-<para><screen><userinput>mkdir ../e2fsprogs-build &amp;&amp;
+<para><screen><userinput>
+mkdir ../e2fsprogs-build &amp;&amp;
cd ../e2fsprogs-build &amp;&amp;
../e2fsprogs-&e2fsprogs-version;/configure --prefix=/usr --with-root-prefix="" \
-&nbsp;&nbsp;&nbsp;&nbsp;--enable-elf-shlibs &amp;&amp;
-make &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-elf-shlibs
+</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And finish off installing the package:</para>
+
+<para><screen><userinput>
make install &amp;&amp;
make install-libs &amp;&amp;
-install-info /usr/share/info/libext2fs.info /usr/share/info/dir</userinput></screen></para>
+install-info /usr/share/info/libext2fs.info /usr/share/info/dir
+</userinput></screen></para>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>--with-root-prefix="":</userinput> The
+reason for supplying this option is because of the setup of the
+e2fsprogs Makefile. Some programs are essential for system use when,
+for example, /usr isn't mounted (like the e2fsck program). These
+programs and libraries, therefore, belong in directories like /lib and
+/sbin. If this option isn't passed to E2fsprogs's configure, it places
+these programs in /usr, which is not what we want.</para>
+
+<para><userinput>--enable-elf-shlibs:</userinput> This creates shared
+libraries that some programs in this package can make use of.</para>
+
+<para><userinput>make install-libs:</userinput> This installs the shared
+libraries that are built.</para>
+
+<para><userinput>install-info...:</userinput> This updates the
+<filename>/usr/share/info/dir</filename> file to include this package's
+info pages to the index.</para>
</sect2>
+
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index e0ae9c7e5..412e99fe6 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -5,9 +5,8 @@
<screen>Estimated build time: &e2fsprogs-time;
Estimated required disk space: &e2fsprogs-compsize;</screen>
-&c6-e2fsprogs-inst;
-&c6-e2fsprogs-exp;
-&aa-e2fsprogs-desc;
+&aa-e2fsprogs-shortdesc;
&aa-e2fsprogs-dep;
+&c6-e2fsprogs-inst;
</sect1>
diff --git a/entities/e2fsprogs.ent b/entities/e2fsprogs.ent
index 352bfa859..ccbd00180 100644
--- a/entities/e2fsprogs.ent
+++ b/entities/e2fsprogs.ent
@@ -2,9 +2,9 @@
<!ENTITY c6-e2fsprogs SYSTEM "../chapter06/e2fsprogs.xml">
<!ENTITY c6-e2fsprogs-inst SYSTEM "../chapter06/e2fsprogs-inst.xml">
-<!ENTITY c6-e2fsprogs-exp SYSTEM "../chapter06/e2fsprogs-exp.xml">
<!ENTITY aa-e2fsprogs SYSTEM "../appendixa/e2fsprogs.xml">
+<!ENTITY aa-e2fsprogs-shortdesc SYSTEM "../appendixa/e2fsprogs-shortdesc.xml">
<!ENTITY aa-e2fsprogs-desc SYSTEM "../appendixa/e2fsprogs-desc.xml">
<!ENTITY aa-e2fsprogs-dep SYSTEM "../appendixa/e2fsprogs-dep.xml">
<!ENTITY aa-e2fsprogs-down SYSTEM "../appendixa/e2fsprogs-down.xml">