Author: jim
Date: 2006-08-09 13:46:46 -0600 (Wed, 09 Aug 2006)
New Revision: 2199
Modified:
/
trunk/BOOK/boot/x86_64/grub-build.xml
trunk/BOOK/final-system/x86_64/grub.xml
trunk/BOOK/introduction/x86_64/changelog.xml
Log:
[EMAIL PROTECTED] (orig r2325): [EMAIL PROTECTED] | 2006-08-09 09:05:03 -0700
Reversed GRUB patch order so that both patches will be successfully applied
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:2324
+ b6734a72-470d-0410-b049-f317dca95413:/:2325
Modified: trunk/BOOK/boot/x86_64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml 2006-08-09 19:46:37 UTC (rev
2198)
+++ trunk/BOOK/boot/x86_64/grub-build.xml 2006-08-09 19:46:46 UTC (rev
2199)
@@ -23,14 +23,6 @@
<title>Installation of GRUB</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../x86/grub-build.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../x86/grub-build.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../../final-system/x86_64/grub.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'p3'])"/>
@@ -40,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../x86/grub-build.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../x86/grub-build.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'p2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../x86/grub-build.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: trunk/BOOK/final-system/x86_64/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86_64/grub.xml 2006-08-09 19:46:37 UTC (rev
2198)
+++ trunk/BOOK/final-system/x86_64/grub.xml 2006-08-09 19:46:46 UTC (rev
2199)
@@ -20,6 +20,12 @@
<sect2 role="installation">
<title>Installation of GRUB</title>
+ <para os="p3">GRUB has an issue that can cause it to segfault when you
+ try to configure a drive to utilize GRUB on x86_64 machines. The following
+ patch fixes this problem:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i
../&grub-use_mmap-patch;</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../x86/grub.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'p1'])"/>
@@ -28,12 +34,6 @@
href="../x86/grub.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'p2'])"/>
- <para os="p3">GRUB has an issue that can cause it to segfault when you
- try to configure a drive to utilize GRUB on x86_64 machines. The following
- patch fixes this problem:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i
../&grub-use_mmap-patch;</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../x86/grub.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml 2006-08-09 19:46:37 UTC
(rev 2198)
+++ trunk/BOOK/introduction/x86_64/changelog.xml 2006-08-09 19:46:46 UTC
(rev 2199)
@@ -34,6 +34,16 @@
-->
<listitem>
+ <para>August 9, 2006</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Reversed order in which GRUB patches are applied
+ (fixes ticket #84).</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>August 6, 2006</para>
<itemizedlist>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
