Changeset e334ef9

Timestamp:

Feb 23, 2006, 12:30:23 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

0b707c6

Parents:

9f5bc2cc

Message:

r2400@server (orig r1198): chris | 2006-02-22 23:36:58 -0800
Fixed GRUB installation instructions

Files:

• boot/x86/grub-build.xml (modified) (2 diffs)
• boot/x86_64-64/grub-build.xml (modified) (1 diff)
• boot/x86_64/grub-build.xml (modified) (3 diffs)
• final-system/x86_64-64/grub.xml (modified) (1 diff)

boot/x86/grub-build.xml

@@ -31 +31 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="aa"><userinput>./configure --prefix=${LFS}/usr \
+<screen os="aa"><userinput>./configure --prefix=/usr \
    --host=${LFS_TARGET}</userinput></screen>
 
@@ -46 +46 @@
     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

boot/x86_64-64/grub-build.xml

@@ -47 +47 @@
     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"

boot/x86_64/grub-build.xml

@@ -31 +31 @@
     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>
 
@@ -46 +46 @@
     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>
@@ -54 +54 @@
     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>

final-system/x86_64-64/grub.xml

@@ -56 +56 @@
 
     <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'])"/>