Changeset 2325

Timestamp:

08/09/06 16:05:03 (2 years ago)

Author:

chris@beaker67.com

Message:

Reversed GRUB patch order so that both patches will be successfully applied

Files:

• trunk/BOOK/boot/x86_64/grub-build.xml (modified) (2 diffs)
• trunk/BOOK/final-system/x86_64/grub.xml (modified) (2 diffs)
• trunk/BOOK/introduction/x86_64/changelog.xml (modified) (1 diff)

trunk/BOOK/boot/x86_64/grub-build.xml

@@ -24 +24 @@
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/grub.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/x86_64/grub.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
@@ -30 +38 @@
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

trunk/BOOK/final-system/x86_64/grub.xml

@@ -21 +21 @@
-    <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"
@@ -28 +34 @@
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='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"

trunk/BOOK/introduction/x86_64/changelog.xml

@@ -33 +33 @@
-
--->
+
+    <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>