From 6d53efc6c17dea8b4a0f9372d04c640cf655fb07 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 12 Jul 2012 00:15:53 +0000
Subject: [PATCH] Update to GRUB-2.00

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9898 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 12 +++++++--
 chapter06/grub.xml      | 58 +++++++++++++++++++++++++++++++++++------
 chapter08/grub.xml      |  3 ++-
 general.ent             |  4 +--
 packages.ent            | 10 +++----
 5 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b75e5a7c5..4df730f65 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
 
+    <listitem>
+      <para>2012-07-11</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Update to GRUB-2.00. Fixes 
+            <ulink url="&lfs-ticket-root;3130">#3130</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-07-10</para>
       <itemizedlist>
@@ -48,8 +58,6 @@
       </itemizedlist>
     </listitem>
 
-
-
     <listitem>
       <para>2012-06-23</para>
       <itemizedlist>
diff --git a/chapter06/grub.xml b/chapter06/grub.xml
index 33c4ce452..249447d1a 100644
--- a/chapter06/grub.xml
+++ b/chapter06/grub.xml
@@ -45,8 +45,7 @@
 <screen><userinput remap="configure">./configure --prefix=/usr          \
             --sysconfdir=/etc      \
             --disable-grub-emu-usb \
-            --disable-efiemu       \
-            --disable-werror</userinput></screen>
+            --disable-efiemu</userinput></screen>
 
     <para>The --disable switches minimize what is built by disabling features
     and testing programs not really needed for LFS.</para>
@@ -74,12 +73,15 @@
       <segtitle>Installed directories</segtitle>
 
       <seglistitem>
-        <seg>grub-bin2h, grub-editenv, grub-fstest, grub-install, grub-kbdcomp,
-        grub-menulst2cfg, grub-mkconfig, grub-mkdevicemap, grub-mkimage,
-        grub-mklayout, grub-mknetdir, grub-mkpasswd-pbkdf2, grub-mkrelpath,
-        grub-mkrescue, grub-probe, grub-reboot, grub-script-check,
-        grub-set-default, grub-setup</seg>
-        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub</seg>
+       
+       <seg>grub-bin2h,           grub-bios-setup, grub-editenv,     grub-fstest,
+            grub-install,         grub-kbdcomp,    grub-menulst2cfg, grub-mkconfig,
+            grub-mkdevicemap,     grub-mkimage,    grub-mklayout,    grub-mknetdir,
+            grub-mkpasswd-pbkdf2, grub-mkrelpath,  grub-mkrescue,    grub-mkstandalone,
+            grub-ofpathname,      grub-probe,      grub-reboot,      grub-script-check,
+            grub-set-default,     grub-setup,      grub-sparc64-setup </seg>
+
+        <seg>/usr/lib/grub, /etc/grub.d, /usr/share/grub, /boot/grub</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -98,6 +100,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-bios-setup">
+        <term><command>grub-bios-setup</command></term>
+        <listitem>
+          <para>Is a helper program for grub-install</para>
+          <indexterm zone="ch-system-grub grub-bios-setup">
+            <primary sortas="b-grub-bios-setup">grub-bios-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-editenv">
         <term><command>grub-editenv</command></term>
         <listitem>
@@ -231,6 +243,26 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-mkstandalone">
+        <term><command>grub-mkstandalone</command></term>
+        <listitem>
+          <para>Generates a standalone image</para>
+          <indexterm zone="ch-system-grub grub-mkstandalone">
+            <primary sortas="b-grub-mkstandalone">grub-mkstandalone</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="grub-ofpathname">
+        <term><command>grub-ofpathname</command></term>
+        <listitem>
+          <para>Is a helper program that prints the path of a GRUB device</para>
+          <indexterm zone="ch-system-grub grub-ofpathname">
+            <primary sortas="b-grub-ofpathname">grub-ofpathname</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="grub-probe">
         <term><command>grub-probe</command></term>
         <listitem>
@@ -281,6 +313,16 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="grub-sparc64-setup">
+        <term><command>grub-sparc64-setup</command></term>
+        <listitem>
+          <para>Is a helper program for grub-setup</para>
+          <indexterm zone="ch-system-grub grub-sparc64-setup">
+            <primary sortas="b-grub-sparc64-setup">grub-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 812c23edb..b446f42dd 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -105,6 +105,7 @@ cat device.map</userinput></screen>
 
 <screen role="nodump"><userinput>grub-install /dev/sda</userinput></screen>
 
+<!-- This does not seem to be true any more
     <note><para><application>grub-install</application> is a script and calls another 
     program, grub-probe, that may fail with a message "cannot stat `/dev/root'".  
     If so, create a temporary symbolic link from your root partition to /dev/root:</para>
@@ -114,7 +115,7 @@ cat device.map</userinput></screen>
     <para>The symbolic link will only be present until the system is rebooted.
     The link is only needed for the installation procedure.
     </para></note>
-
+-->
   </sect2>
 
   <sect2>
diff --git a/general.ent b/general.ent
index d46cd9886..2e3a1d087 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120710">
-<!ENTITY releasedate "July 10, 2012">
+<!ENTITY version "SVN-20120711">
+<!ENTITY releasedate "July 11, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 596e2859e..79dc607bd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -236,13 +236,13 @@
 <!ENTITY groff-ch6-du "78 MB">
 <!ENTITY groff-ch6-sbu "0.4 SBU">
 
-<!ENTITY grub-version "1.99">
-<!ENTITY grub-size "4,544 KB">
+<!ENTITY grub-version "2.00">
+<!ENTITY grub-size "8,092 KB">
 <!ENTITY grub-url "&gnu;grub/grub-&grub-version;.tar.gz">
-<!ENTITY grub-md5 "ca9f2a2d571b57fc5c53212d1d22e2b5">
+<!ENTITY grub-md5 "e927540b6eda8b024fb0391eeaa4091c">
 <!ENTITY grub-home "&gnu-software;grub/">
-<!ENTITY grub-ch6-du "76 MB">
-<!ENTITY grub-ch6-sbu "0.6 SBU">
+<!ENTITY grub-ch6-du "112 MB">
+<!ENTITY grub-ch6-sbu "0.8 SBU">
 
 <!ENTITY gzip-version "1.5">
 <!ENTITY gzip-size "704 KB">