r2034 - / trunk/BOOK/bootable/mips trunk/BOOK/bootable/x86 trunk/BOOK/final-system/x86

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 18 12:45:21 PDT 2006


Author: jim
Date: 2006-07-18 13:45:19 -0600 (Tue, 18 Jul 2006)
New Revision: 2034

Modified:
   /
   trunk/BOOK/bootable/mips/colo.xml
   trunk/BOOK/bootable/x86/grub.xml
   trunk/BOOK/final-system/x86/grub.xml
Log:
 r4668 at server (orig r2155):  chris at beaker67.com | 2006-07-18 09:43:20 -0700
 Text updates



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:2154
   + b6734a72-470d-0410-b049-f317dca95413:/:2155

Modified: trunk/BOOK/bootable/mips/colo.xml
===================================================================
--- trunk/BOOK/bootable/mips/colo.xml	2006-07-18 19:45:10 UTC (rev 2033)
+++ trunk/BOOK/bootable/mips/colo.xml	2006-07-18 19:45:19 UTC (rev 2034)
@@ -48,9 +48,10 @@
   <para os="e">Included in <filename class="directory">/usr/lib/colo/examples</filename>
   are more examples of a <filename>default.colo</filename> file.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='v'])"/>
+  <para os="v">The FHS stipulates that the bootloader's configuration file shoul
+d
+  be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
+  To satisfy this requirement for Colo, issue the following command:</para>
 
 <screen os="f"><userinput>mkdir -v /etc/colo &&
 ln -sv /boot/colo/default.colo /etc/colo</userinput></screen>

Modified: trunk/BOOK/bootable/x86/grub.xml
===================================================================
--- trunk/BOOK/bootable/x86/grub.xml	2006-07-18 19:45:10 UTC (rev 2033)
+++ trunk/BOOK/bootable/x86/grub.xml	2006-07-18 19:45:19 UTC (rev 2034)
@@ -130,7 +130,7 @@
   material, additional information regarding GRUB is located on its
   website at: <ulink url="http://www.gnu.org/software/grub/"/>.</para>
 
-  <para os="v">The FHS stipulates that Bootloader's configuration file should
+  <para os="v">The FHS stipulates that the bootloader's configuration file should
   be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
   To satisfy this requirement for GRUB, issue the following command:</para>
 

Modified: trunk/BOOK/final-system/x86/grub.xml
===================================================================
--- trunk/BOOK/final-system/x86/grub.xml	2006-07-18 19:45:10 UTC (rev 2033)
+++ trunk/BOOK/final-system/x86/grub.xml	2006-07-18 19:45:19 UTC (rev 2034)
@@ -24,11 +24,11 @@
     <title>Installation of GRUB</title>
 
    <para os="p1">GRUB has an issue where it sometimes doesn't detect
-   the disk geometry correctly when used with Linux 2.6. This results
+   the disk geometry correctly when used with Linux 2.6, resulting
    in the error message <literal>Error 24: Attempt to access block outside
-   partition</literal>. This patch also contains various fixes for raid
-   controllers along with support for the new Intel Mac. Apply the
-   following patch using the command below:</para>
+   partition</literal>. The following patch contains a fix for this issue
+   as well as various fixes for raid controllers and support for the
+   new Intel Mac:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
 




More information about the cross-lfs mailing list