aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter06/config-glibc.xml33
-rw-r--r--chapter06/config-ldso.xml31
-rw-r--r--chapter06/config-shadowpwd.xml2
-rw-r--r--chapter06/config-sysklogd.xml2
-rw-r--r--chapter06/config-sysvinit.xml2
-rw-r--r--chapter06/config-vim.xml2
-rw-r--r--chapter06/configure.xml12
-rw-r--r--chapter06/e2fsprogs-inst.xml19
-rw-r--r--chapter06/lilo-inst.xml5
-rw-r--r--chapter06/patch-inst.xml3
-rw-r--r--chapter06/shadowpwd-inst.xml4
-rw-r--r--chapter06/shadowpwd.xml1
-rw-r--r--chapter06/sysklogd.xml1
-rw-r--r--chapter06/sysvinit.xml1
-rw-r--r--chapter06/tar-inst.xml4
-rw-r--r--chapter06/vim.xml1
16 files changed, 62 insertions, 61 deletions
diff --git a/chapter06/config-glibc.xml b/chapter06/config-glibc.xml
index 58369f33a..afafb6c73 100644
--- a/chapter06/config-glibc.xml
+++ b/chapter06/config-glibc.xml
@@ -55,3 +55,36 @@ by running:</para>
</sect2>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Configuring Dynamic Loader</title>
+
+<para>By default, the dynamic loader
+(<filename>/lib/ld-linux.so.2</filename>) searches through <filename
+class="directory">/lib</filename> and <filename
+class="directory">/usr/lib</filename> for dynamic libraries that are needed
+by programs when you run them. However, if there are libraries in
+directories other than <filename class="directory">/lib</filename> and
+<filename class="directory">/usr/lib</filename>, you need to add them to
+the <filename>/etc/ld.so.conf</filename> file for the dynamic
+loader to find them. Two directories that are commonly known to contain
+additional libraries are <filename
+class="directory">/usr/local/lib</filename> and <filename
+class="directory">/opt/lib</filename>, so we add those directories to the
+dynamic loader's search path.</para>
+
+<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
+following:</para>
+
+<para><screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+# Begin /etc/ld.so.conf
+
+/usr/local/lib
+/opt/lib
+
+# End /etc/ld.so.conf
+<userinput>EOF</userinput></screen></para>
+
+</sect2>
+
diff --git a/chapter06/config-ldso.xml b/chapter06/config-ldso.xml
deleted file mode 100644
index 522fd0431..000000000
--- a/chapter06/config-ldso.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<sect2>
-<title>Configuring Dynamic Loader</title>
-
-<para>By default, the dynamic loader
-(<filename>/lib/ld-linux.so.2</filename>) searches through <filename
-class="directory">/lib</filename> and <filename
-class="directory">/usr/lib</filename> for dynamic libraries that are needed
-by programs when you run them. However, if there are libraries in
-directories other than <filename class="directory">/lib</filename> and
-<filename class="directory">/usr/lib</filename>, you need to add them to
-the <filename>/etc/ld.so.conf</filename> file for the dynamic
-loader to find them. Two directories that are commonly known to contain
-additional libraries are <filename
-class="directory">/usr/local/lib</filename> and <filename
-class="directory">/opt/lib</filename>, so we add those directories to the
-dynamic loader's search path.</para>
-
-<para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
-following:</para>
-
-<para><screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
-# Begin /etc/ld.so.conf
-
-/usr/local/lib
-/opt/lib
-
-# End /etc/ld.so.conf
-<userinput>EOF</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/config-shadowpwd.xml b/chapter06/config-shadowpwd.xml
index 265851254..bb10363b5 100644
--- a/chapter06/config-shadowpwd.xml
+++ b/chapter06/config-shadowpwd.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2><title>Configuring Shadow Password Suite</title>
<para>This package contains utilities to modify users' passwords, add
diff --git a/chapter06/config-sysklogd.xml b/chapter06/config-sysklogd.xml
index 37ca8fbdd..95d5f5820 100644
--- a/chapter06/config-sysklogd.xml
+++ b/chapter06/config-sysklogd.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2><title>Configuring Sysklogd</title>
<para>Create a new file <filename>/etc/syslog.conf</filename> by running the
diff --git a/chapter06/config-sysvinit.xml b/chapter06/config-sysvinit.xml
index bea7a2806..79e273bfb 100644
--- a/chapter06/config-sysvinit.xml
+++ b/chapter06/config-sysvinit.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2><title>Configuring Sysvinit</title>
<para>Create a new file <filename>/etc/inittab</filename> by running the
diff --git a/chapter06/config-vim.xml b/chapter06/config-vim.xml
index 39aea4b4a..8c92a5063 100644
--- a/chapter06/config-vim.xml
+++ b/chapter06/config-vim.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2><title>Configuring Vim</title>
<para>By default, vim runs in vi compatible mode. Some people might like this,
diff --git a/chapter06/configure.xml b/chapter06/configure.xml
index 88350ef17..8d891212e 100644
--- a/chapter06/configure.xml
+++ b/chapter06/configure.xml
@@ -1,16 +1,10 @@
<sect1 id="ch06-configure">
-<title>Configuring essential software</title>
+<title>Configuring system components</title>
<?dbhtml filename="configure.html" dir="chapter06"?>
-<para>Now that all software is installed, all that we need to do to get a few
-programs running properly is to create their configuration files.</para>
+<para>Now that all software is installed, all that we need to do is perform
+a few configuration tasks.</para>
-&c6-cf-vim;
-&c6-cf-glibc;
-&c6-cf-ldso;
-&c6-cf-sysklogd;
-&c6-cf-shadowpwd;
-&c6-cf-sysvinit;
&c6-cf-keyboard;
&c6-cf-utmp;
&c6-cf-password;
diff --git a/chapter06/e2fsprogs-inst.xml b/chapter06/e2fsprogs-inst.xml
index 88abd266e..389e18d1b 100644
--- a/chapter06/e2fsprogs-inst.xml
+++ b/chapter06/e2fsprogs-inst.xml
@@ -4,7 +4,7 @@
<title>Installation of E2fsprogs</title>
<para>It is recommended to build E2fsprogs outside of the
-source tree. Create the build directory:</para>
+source tree:</para>
<para><screen><userinput>mkdir ../e2fsprogs-build &amp;&amp;
cd ../e2fsprogs-build</userinput></screen></para>
@@ -18,15 +18,14 @@ cd ../e2fsprogs-build</userinput></screen></para>
<itemizedlist>
-<listitem><para><userinput>--with-root-prefix="":</userinput> This option
-is used because of the e2fsprogs Makefile. Some programs are essential for
-system use when, for example, <filename class="directory">/usr</filename>
-isn't mounted (like the e2fsck program). These programs and libraries,
-therefore, belong in directories like <filename
-class="directory">/lib</filename> and <filename
-class="directory">/sbin</filename>. If this option isn't passed to
-E2fsprogs's configure, the programs are placed in the <filename
-class="directory">/usr</filename> directory, which is not what we
+<listitem><para><userinput>--with-root-prefix="":</userinput> Certain
+programs (such as the e2fsck program) are considered essential programs.
+When, for example, <filename class="directory">/usr</filename> isn't
+mounted, these essential program have to be available. They belong in
+directories like <filename class="directory">/lib</filename> and
+<filename class="directory">/sbin</filename>. If this option isn't passed
+to E2fsprogs's configure, the programs are placed in the
+<filename class="directory">/usr</filename> directory, which is not what we
want.</para></listitem>
<listitem><para><userinput>--enable-elf-shlibs:</userinput> This creates
diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml
index 445e877b4..995f4c290 100644
--- a/chapter06/lilo-inst.xml
+++ b/chapter06/lilo-inst.xml
@@ -15,11 +15,6 @@ GRUB, which is available at <ulink url="&hints-root;grub-howto.txt"/>.</para>
<para><screen><userinput>make install</userinput></screen></para>
-<para>It appears that compilation of this package fails on certain machines
-when the <emphasis>-g</emphasis> compiler flag is used. If you can't compile
-Lilo at all, you should try to remove the <emphasis>-g</emphasis> value from
-the CFLAGS variable in the <filename>Makefile</filename> file.</para>
-
<para>At the end of the installation, a message will appear stating that
<filename>/sbin/lilo</filename> has to be executed. This is pointless because
the <filename>/etc/lilo.conf</filename> file isn't present yet. We will
diff --git a/chapter06/patch-inst.xml b/chapter06/patch-inst.xml
index cbd59252e..ac7423d34 100644
--- a/chapter06/patch-inst.xml
+++ b/chapter06/patch-inst.xml
@@ -5,8 +5,7 @@
<para>Prepare Patch to be compiled:</para>
-<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-&nbsp;&nbsp;&nbsp;&nbsp;./configure --prefix=/usr</userinput></screen></para>
+<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr</userinput></screen></para>
<para>Continue with compiling the package:</para>
diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml
index 4fbd05c89..2cd239541 100644
--- a/chapter06/shadowpwd-inst.xml
+++ b/chapter06/shadowpwd-inst.xml
@@ -11,8 +11,8 @@ be found at <ulink url="&hints-root;shadowpasswd_plus.txt"/>.</para>
<para>Prepare Shadow to be compiled:</para>
-<para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libdir=/usr/lib --enable-shared</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --libdir=/usr/lib \
+&nbsp;&nbsp;&nbsp;&nbsp;--enable-shared</userinput></screen></para>
<para>Continue with compiling the package:</para>
diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml
index cc8b60fc3..f6238c0b1 100644
--- a/chapter06/shadowpwd.xml
+++ b/chapter06/shadowpwd.xml
@@ -8,5 +8,6 @@ Estimated required disk space: &shadow-compsize;</screen>
&aa-shadowpwd-shortdesc;
&aa-shadowpwd-dep;
&c6-shadowpwd-inst;
+&c6-cf-shadowpwd;
</sect1>
diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml
index aba692da0..53b5028cc 100644
--- a/chapter06/sysklogd.xml
+++ b/chapter06/sysklogd.xml
@@ -8,5 +8,6 @@ Estimated required disk space: &sysklogd-compsize;</screen>
&aa-sysklogd-shortdesc;
&aa-sysklogd-dep;
&c6-sysklogd-inst;
+&c6-cf-sysklogd;
</sect1>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index 4d96ca325..69826f4d5 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -8,5 +8,6 @@ Estimated required disk space: &sysvinit-compsize;</screen>
&aa-sysvinit-shortdesc;
&aa-sysvinit-dep;
&c6-sysvinit-inst;
+&c6-cf-sysvinit;
</sect1>
diff --git a/chapter06/tar-inst.xml b/chapter06/tar-inst.xml
index 098a0b8a7..a2842f35e 100644
--- a/chapter06/tar-inst.xml
+++ b/chapter06/tar-inst.xml
@@ -14,8 +14,8 @@ gzip files.</para>
<para>Prepare Tar to be compiled:</para>
-<para><screen><userinput>./configure --prefix=/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin --bindir=/bin</userinput></screen></para>
+<para><screen><userinput>./configure --prefix=/usr --bindir=/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=/usr/bin</userinput></screen></para>
<para>Continue with compiling the package:</para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index a0c61878f..22ef51928 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -9,5 +9,6 @@ Estimated required disk space: &vim-compsize;</screen>
&aa-vim-alt;
&aa-vim-dep;
&c6-vim-inst;
+&c6-cf-vim;
</sect1>