r1198 - in trunk/BOOK: boot/x86 boot/x86_64 boot/x86_64-64 final-system/x86_64-64

chris at linuxfromscratch.org chris at linuxfromscratch.org
Wed Feb 22 23:36:59 PST 2006


Author: chris
Date: 2006-02-23 00:36:58 -0700 (Thu, 23 Feb 2006)
New Revision: 1198

Modified:
   trunk/BOOK/boot/x86/grub-build.xml
   trunk/BOOK/boot/x86_64-64/grub-build.xml
   trunk/BOOK/boot/x86_64/grub-build.xml
   trunk/BOOK/final-system/x86_64-64/grub.xml
Log:
Fixed GRUB installation instructions

Modified: trunk/BOOK/boot/x86/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86/grub-build.xml	2006-02-23 07:25:17 UTC (rev 1197)
+++ trunk/BOOK/boot/x86/grub-build.xml	2006-02-23 07:36:58 UTC (rev 1198)
@@ -30,7 +30,7 @@
     href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=${LFS}/usr \
+<screen os="aa"><userinput>./configure --prefix=/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -45,14 +45,10 @@
     href="../../final-system/x86/grub.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make install
+<screen os="ab"><userinput>make DESTDIR=${LFS} install
 mkdir ${LFS}/boot/grub
 cp ${LFS}/usr/lib/grub/i386-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
     <para os="ac">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

Modified: trunk/BOOK/boot/x86_64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64/grub-build.xml	2006-02-23 07:25:17 UTC (rev 1197)
+++ trunk/BOOK/boot/x86_64/grub-build.xml	2006-02-23 07:36:58 UTC (rev 1198)
@@ -30,7 +30,7 @@
     href="../x86/grub-build.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=${LFS}/usr \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -45,7 +45,7 @@
     href="../x86/grub-build.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="ab"><userinput>make install
+<screen os="ab"><userinput>make DESTDIR=${LFS} install
 mkdir ${LFS}/boot/grub
 cp ${LFS}/usr/lib/grub/x86_64-pc/stage{1,2} ${LFS}/boot/grub</userinput></screen>
 
@@ -53,9 +53,13 @@
     href="../../final-system/x86_64/grub.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">The <filename class="directory">x86_64-pc</filename>
+    directory contains a number of <filename>*stage1_5</filename>
+    files, different ones for different file systems. Review the files
+    available and copy the appropriate ones to the <filename
+    class="directory">${LFS}/boot/grub</filename> directory. Most
+    users will copy the <filename>e2fs_stage1_5</filename> and/or
+    <filename>reiserfs_stage1_5</filename> files.</para>
 
   </sect2>
 

Modified: trunk/BOOK/boot/x86_64-64/grub-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/grub-build.xml	2006-02-23 07:25:17 UTC (rev 1197)
+++ trunk/BOOK/boot/x86_64-64/grub-build.xml	2006-02-23 07:36:58 UTC (rev 1198)
@@ -46,7 +46,7 @@
     href="../x86/grub-build.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=${LFS} --host=${LFS_TARGET}</userinput></screen>
+<screen os="aa"><userinput>./configure --prefix=/usr --host=${LFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/grub-build.xml"

Modified: trunk/BOOK/final-system/x86_64-64/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/grub.xml	2006-02-23 07:25:17 UTC (rev 1197)
+++ trunk/BOOK/final-system/x86_64-64/grub.xml	2006-02-23 07:36:58 UTC (rev 1198)
@@ -55,10 +55,6 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/grub.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 




More information about the cross-lfs mailing list