Trunk is now identical to Testing

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

1 files changed, 76 insertions, 5 deletions

diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 721c2731e..9f5a0efe0 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -3,13 +3,14 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-grub" xreflabel="Grub" role="wrap">
+<sect1 id="ch-system-grub" role="wrap">
 <title>Grub-&grub-version;</title>
 <?dbhtml filename="grub.html"?>
 
 <indexterm zone="ch-system-grub"><primary sortas="a-Grub">Grub</primary></indexterm>
 
 <sect2 role="package"><title/>
+<para>The Grub package contains the Grand Unified Bootloader.</para>
 
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
@@ -17,28 +18,49 @@
 <seglistitem><seg>0.2 SBU</seg><seg>10 MB</seg></seglistitem>
 </segmentedlist>
 
+<segmentedlist>
+<segtitle>Grub installation depends on</segtitle>
+<seglistitem><seg>Bash, Binutils, Coreutils, Diffutils,
+GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem>
+</segmentedlist>
 </sect2>
 
 <sect2 role="installation">
 <title>Installation of Grub</title>
 
+<para>This package is known to have issues when its default
+optimization flags (including the <parameter>-march</parameter> and
+<parameter>-mcpu</parameter> options) are changed. If any environment
+variables that override default optimizations have been defined, such
+as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>,
+unset them when building Grub.</para>
+
 <para>Prepare Grub for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr</userinput></screen>
 
-<para>Now compile the package:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
 <para>To test the results, issue:
 <userinput>make check</userinput>.</para>
 
-<para>Now install it:</para>
+<para>Note that the test results will always show the error
+<quote>ufs2_stage1_5 is too big.</quote> This is due to a compiler
+issue, but can be ignored unless you plan to boot from an UFS
+partition. The partitions are normally only used by Sun
+workstations.</para>
+
+<para>Install the package:</para>
 
 <screen><userinput>make install
 mkdir /boot/grub
 cp /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen>
 
+<para>Replace <filename class="directory">i386-pc</filename> with whatever
+directory is appropriate for the hardware in use.</para>
+
 <para>The <filename class="directory">i386-pc</filename> directory
 contains a number of <filename>*stage1_5</filename> files, different
 ones for different file systems. Review the files available and copy
@@ -52,9 +74,58 @@ copy the <filename>e2fs_stage1_5</filename> and/or
 
 <sect2 id="contents-grub" role="content"><title>Contents of Grub</title>
 
-<para>See testing</para>
+<segmentedlist>
+<segtitle>Installed programs</segtitle>
+<seglistitem><seg>grub, grub-install,
+grub-md5-crypt, grub-terminfo, and mbchk</seg></seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<varlistentry id="grub">
+<term><command>grub</command></term>
+<listitem>
+<para>The Grand Unified Bootloader's command shell</para>
+<indexterm zone="ch-system-grub grub"><primary sortas="b-grub">grub</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="grub-install">
+<term><command>grub-install</command></term>
+<listitem>
+<para>Installs GRUB on the given device</para>
+<indexterm zone="ch-system-grub grub-install"><primary sortas="b-grub-install">grub-install</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="grub-md5-crypt">
+<term><command>grub-md5-crypt</command></term>
+<listitem>
+<para>Encrypts a password in MD5 format</para>
+<indexterm zone="ch-system-grub grub-md5-crypt"><primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="grub-terminfo">
+<term><command>grub-terminfo</command></term>
+<listitem>
+<para>Generates a terminfo command from a terminfo name; it can be
+employed if an unknown terminal is being used</para>
+<indexterm zone="ch-system-grub grub-terminfo"><primary sortas="b-grub-terminfo">grub-terminfo</primary></indexterm>
+</listitem>
+</varlistentry>
+
+<varlistentry id="mbchk">
+<term><command>mbchk</command></term>
+<listitem>
+<para>Checks the format of a multi-boot kernel</para>
+<indexterm zone="ch-system-grub mbchk"><primary sortas="b-mbchk">mbchk</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
+</sect2>
 
 </sect1>
+