aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter06/utillinux-inst.xml21
-rw-r--r--chapter06/utillinux.xml5
-rw-r--r--entities/utillinux.ent1
3 files changed, 18 insertions, 9 deletions
diff --git a/chapter06/utillinux-inst.xml b/chapter06/utillinux-inst.xml
index b8d0c88e5..6d0232cf1 100644
--- a/chapter06/utillinux-inst.xml
+++ b/chapter06/utillinux-inst.xml
@@ -1,9 +1,11 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>FHS compliance notes</title>
<para>The FHS recommends that we use /var/lib/hwclock, instead of the
usual /etc, as the location of the adjtime file. To make hwclock, which
-is part of the util-linux package, FHS-compliant, run the following.</para>
+is part of the util-linux package, FHS-compliant, run the following:</para>
<para><screen><userinput>cp hwclock/hwclock.c{,.backup} &amp;&amp;
sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
@@ -15,11 +17,20 @@ mkdir -p /var/lib/hwclock</userinput></screen></para>
<sect2>
<title>Installation of Util-linux</title>
-<para>Install Util-linux by running the following commands:</para>
+<para>Prepare Util-linux to be compiled:</para>
+
+<para><screen><userinput>./configure</userinput></screen></para>
+
+<para>Continue with compiling the package:</para>
+
+<para><screen><userinput>make HAVE_SLN=yes</userinput></screen></para>
+
+<para>The <emphasis>HAVE_SLN</emphasis> option prevents this package,
+which was already was installed by Glibc, from being built again.</para>
+
+<para>Finish installing the package:</para>
-<para><screen><userinput>./configure &amp;&amp;
-make HAVE_SLN=yes &amp;&amp;
-make HAVE_SLN=yes install</userinput></screen></para>
+<para><screen><userinput>make HAVE_SLN=yes install</userinput></screen></para>
</sect2>
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 41b4d2c89..6238ca924 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -5,9 +5,8 @@
<screen>Estimated build time: &util-linux-time;
Estimated required disk space: &util-linux-compsize;</screen>
-&c6-utillinux-inst;
-&c6-utillinux-exp;
-&aa-utillinux-desc;
+&aa-utillinux-shortdesc;
&aa-utillinux-dep;
+&c6-utillinux-inst;
</sect1>
diff --git a/entities/utillinux.ent b/entities/utillinux.ent
index f78542123..2b4383eee 100644
--- a/entities/utillinux.ent
+++ b/entities/utillinux.ent
@@ -5,7 +5,6 @@
<!ENTITY c6-utillinux SYSTEM "../chapter06/utillinux.xml">
<!ENTITY c6-utillinux-inst SYSTEM "../chapter06/utillinux-inst.xml">
-<!ENTITY c6-utillinux-exp SYSTEM "../chapter06/utillinux-exp.xml">
<!ENTITY aa-utillinux SYSTEM "../appendixa/utillinux.xml">
<!ENTITY aa-utillinux-desc SYSTEM "../appendixa/utillinux-desc.xml">