Removed LILO and Bin86. Replaced them with Grub

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

7 files changed, 49 insertions, 80 deletions

diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml
deleted file mode 100644
index ee2fb4c3a..000000000
--- a/chapter06/bin86-inst.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Bin86</title>
-
-<para>This package is only needed if you decide to use Lilo on your LFS
-system. If you're going to use something else like Grub you won't need
-bin86. Check the documentation for your favorite boot loader to see if
-you need the bin86 package (usually only ld86 and/or as86 from this
-package are required).</para>
-
-<para>Keep in mind, though, that it's not just boot
-loaders that use the bin86 package. There is always the chance that some
-other package needs programs from this package, so keep that in mind if
-you decide to skip this.</para>
-
-<para>Compile the package:</para>
-
-<para><screen><userinput>make</userinput></screen></para>
-
-<para>And install it:</para>
-
-<para><screen><userinput>make PREFIX=/usr install</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml
deleted file mode 100644
index 34b663707..000000000
--- a/chapter06/bin86.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect1 id="ch06-bin86">
-<title>Installing Bin86-&bin86-version;</title>
-<?dbhtml filename="bin86.html" dir="chapter06"?>
-
-<screen>Estimated build time:           &bin86-time;
-Estimated required disk space:  &bin86-compsize;</screen>
-
-&aa-bin86-shortdesc;
-&aa-bin86-dep;
-&c6-bin86-inst;
-
-</sect1>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b4d9ad8a9..fc943e5f6 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -41,16 +41,15 @@
 &c6-bash;
 &c6-file;
 &c6-libtool;
-&c6-bin86;
 &c6-bzip2;
 &c6-ed;
 &c6-kbd;
 &c6-diffutils;
 &c6-e2fsprogs;
 &c6-grep;
+&c6-grub;
 &c6-gzip;
 &c6-man;
-&c6-lilo;
 &c6-make;
 &c6-modutils;
 &c6-patch;
diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml
new file mode 100644
index 000000000..de889e0d9
--- /dev/null
+++ b/chapter06/grub-inst.xml
@@ -0,0 +1,36 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of Grub</title>
+
+<para>Grub needs a patch applied that fixes a compile problem with
+GCC-3.3.1:</para>
+
+<para><screen><userinput>patch -Np1 -i ../grub-&grub-patch-version;.patch</userinput></screen></para>
+
+<para>Prepare Grub for compilation:</para>
+
+<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para>
+
+<para>Compile the package:</para>
+
+<para><screen><userinput>make</userinput></screen></para>
+
+<para>And install it:</para>
+
+<para><screen><userinput>make install
+mkdir /boot/grub
+cp /usr/share/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen></para>
+
+<para>Replace <filename class="directory">i386-pc</filename> with whatever
+directory is appropriate for your hardware.</para>
+
+<para>The <filename class="directory">i386-pc</filename> directory also
+contains a number of <filename>*stage1_5</filename> files, different ones
+for different filesystems. Have a look at the ones available and copy the
+appropriate ones to the <filename class="directory">/boot/grub</filename>
+directory. Most people will copy the <filename>e2fs_stage1_5</filename>
+and/or <filename>reiserfs_stage1_5</filename> files.</para>
+
+</sect2>
+
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
new file mode 100644
index 000000000..1eadcb226
--- /dev/null
+++ b/chapter06/grub.xml
@@ -0,0 +1,12 @@
+<sect1 id="ch06-grub">
+<title>Installing Grub-&grub-version;</title>
+<?dbhtml filename="grub.html" dir="chapter06"?>
+
+<screen>Estimated build time:           &grub-time;
+Estimated required disk space:  &grub-compsize;</screen>
+
+&aa-grub-shortdesc;
+&aa-grub-dep;
+&c6-grub-inst;
+
+</sect1>
diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml
deleted file mode 100644
index 0dc483e5f..000000000
--- a/chapter06/lilo-inst.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Lilo</title>
-
-<para>We have chosen Lilo as a boot loader because we feel comfortable with it, but you 
-may wish to choose another. Fabio Fracassi has written a hint on 
-GRUB, which is available at <ulink url="&hints-root;grub-howto.txt"/>.</para>
-
-<para>Compile Lilo:</para>
-
-<para><screen><userinput>make</userinput></screen></para>
-
-<para>And install it:</para>
-
-<para><screen><userinput>make install</userinput></screen></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
-complete the installation of lilo in Chapter 8.</para>
-
-<para>The standard LILO prompt, or menu, may be replaced by the
-LFS logo or any logo you like. Martin Imobersteg has written a
-hint about this, which is located at 
-<ulink url="&hints-root;bootlogo.txt"/>.</para>
-
-</sect2>
diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml
deleted file mode 100644
index fe4e951c6..000000000
--- a/chapter06/lilo.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect1 id="ch06-lilo">
-<title>Installing Lilo-&lilo-version;</title>
-<?dbhtml filename="lilo.html" dir="chapter06"?>
-
-<screen>Estimated build time:           &lilo-time;
-Estimated required disk space:  &lilo-compsize;</screen>
-
-&aa-lilo-shortdesc;
-&aa-lilo-dep;
-&c6-lilo-inst;
-
-</sect1>