r1969 - / trunk/BOOK/boot/x86_64-64 trunk/BOOK/bootable/x86_64-64 trunk/BOOK/final-system/x86_64-64

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Jul 11 12:46:26 PDT 2006


Author: jim
Date: 2006-07-11 13:46:25 -0600 (Tue, 11 Jul 2006)
New Revision: 1969

Modified:
   /
   trunk/BOOK/boot/x86_64-64/bin86.xml
   trunk/BOOK/boot/x86_64-64/bootloaders.xml
   trunk/BOOK/boot/x86_64-64/lilo-build.xml
   trunk/BOOK/boot/x86_64-64/lilo.xml
   trunk/BOOK/bootable/x86_64-64/lilo.xml
   trunk/BOOK/final-system/x86_64-64/bin86.xml
   trunk/BOOK/final-system/x86_64-64/lilo.xml
Log:
 r4491 at server (orig r2070):  chris at beaker67.com | 2006-07-11 10:28:53 -0700
 Text fixes, mainly in capitalization in the names of Lilo and GRUB



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

Modified: trunk/BOOK/boot/x86_64-64/bin86.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/bin86.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/boot/x86_64-64/bin86.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -22,7 +22,7 @@
   <sect2 role="installation">
     <title>Installation of Bin86</title>
 
-    <para os="a">We are building bin86 so that we can compile lilo.
+    <para os="a">We are building Bin86 so that we can compile Lilo.
       Both <command>as86</command> and <command>ld86</command> need to
       run on the host system to assemble x86_64 code.  We cannot
       compile the whole package like this, but fortunately these two
@@ -44,7 +44,7 @@
 make CC=gcc -C ld ld86</userinput></screen>
 
     <para os="e">Install the assembler and linker where they will be on
-      the PATH when we build lilo, using prefixes to show that their
+      the PATH when we build Lilo, using prefixes to show that their
       output is not for a native system.</para>
 
 <screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86

Modified: trunk/BOOK/boot/x86_64-64/bootloaders.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/bootloaders.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/boot/x86_64-64/bootloaders.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -11,14 +11,14 @@
   <title>Building a bootloader</title>
 
     <para>On x86 and x86_64 (multilib) architectures, the preferred
-      bootloader is Grub.  Unfortunately, Grub doesn"t work on x86_64
+      bootloader is GRUB.  Unfortunately, GRUB doesn't work on x86_64
       Pure64 - the stage2 files can be correctly built as 32-bit, but the
-      grub shell is a 64-bit program, and tries to execute some of the
-      stage2 routines - this results in a segmentation fault. Therefore,
-      in the final system we use Lilo as the bootloader.
+      <command>grub</command> shell is a 64-bit program, and tries to
+      execute some of the stage2 routines - this results in a segmentation
+      fault. Therefore, in the final system we use Lilo as the bootloader.
     </para>
 
-    <para>If you already have a bootloader, such as Grub, installed on
+    <para>If you already have a bootloader, such as GRUB, installed on
       the system then you should use that to make your new kernel bootable.
    </para>
 

Modified: trunk/BOOK/boot/x86_64-64/lilo-build.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/lilo-build.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/boot/x86_64-64/lilo-build.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -22,7 +22,7 @@
   <sect2 role="installation">
     <title>Installation of Lilo</title>
 
-    <para os="a">The following patch forces lilo to use our cross-compiler
+    <para os="a">The following patch forces Lilo to use our cross-compiler
       (except for a couple of utilities which run during the compile),
       and to look for as86 and ld86 under the names by which we installed
       them.</para>

Modified: trunk/BOOK/boot/x86_64-64/lilo.xml
===================================================================
--- trunk/BOOK/boot/x86_64-64/lilo.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/boot/x86_64-64/lilo.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -17,11 +17,11 @@
 
   <para os="a">You are nearly ready to boot to the new temporary system.
   One of the last things to do is to ensure that the system can be booted.
-  The instructions below apply only to x86_64 machines on which lilo is going
-  to be installed. Information on using a pre-installed Grub on machines
+  The instructions below apply only to x86_64 machines on which Lilo is going
+  to be installed. Information on using a pre-installed GRUB on machines
   currently running as x86 or x86_64 multilib should be available in the
   usual resource-specific locations for those architectures.  If you have
-  installed an x86 version of lilo, these instructions should be modified
+  installed an x86 version of Lilo, these instructions should be modified
   to refer to the <command>lilo</command> and <command>keytab-lilo.pl
   </command> commands you installed on the host system.</para>
 
@@ -30,9 +30,9 @@
   xpointer="xpointer(//*[@os='b'])"/>
 
   <para os="c">If you have multiple systems on your machine using a different
-  bootloader such as grub, you may prefer to use that instead - consult the
+  bootloader such as GRUB, you may prefer to use that instead - consult the
   appropriate documentation.  The rest of this section assumes you are going
-  to use lilo.</para> 
+  to use Lilo.</para> 
 
   <para os="d">Earlier, we compiled and installed the Lilo boot loader software
   in preparation for this step. The procedure involves writing a boot image to
@@ -41,11 +41,11 @@
   mkrescue to create a Lilo boot floppy, or CD (using e.g. dvdrecord from
   dvdrtools) as a test and as a backup.</para>
 
-  <para os="e">Normally, you interact with lilo by using the cursor and enter
+  <para os="e">Normally, you interact with Lilo by using the cursor and enter
   keys to select from the available option(s), but sometimes it is necessary to
   add other boot options, such as e.g. 'init=/bin/bash' to debug boot failures.
   The more your keyboard layout differs from the US qwerty layout, the harder
-  it will be to type boot options unless lilo knows about your keyboard layout.
+  it will be to type boot options unless Lilo knows about your keyboard layout.
   So, we will create a key table for Lilo (.ktl) file - at one point in the
   documentation these are referred to as .klt files, which may be a typo, but
   has been followed by some distros.  The name, and location, are not important

Modified: trunk/BOOK/bootable/x86_64-64/lilo.xml
===================================================================
--- trunk/BOOK/bootable/x86_64-64/lilo.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/bootable/x86_64-64/lilo.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -17,7 +17,7 @@
 
     <para os="a">Your shiny new CLFS system is almost complete. One of the
       last things to do is to ensure that the system can be properly
-      booted. The instructions below apply only to computers using lilo,
+      booted. The instructions below apply only to computers using Lilo,
       which in the context of this book means x86_64 Pure64 systems.
       Information on <quote>boot loading</quote> for other architectures
       should be available in the usual resource-specific locations for
@@ -28,7 +28,7 @@
   xpointer="xpointer(//*[@os='b'])"/>
 
     <para os="c">If you have multiple systems on your machine using a
-      different bootloader such as Grub, you may prefer to use that
+      different bootloader such as GRUB, you may prefer to use that
       instead - consult the appropriate documentation.  The rest of
       this section assumes you are going to use Lilo.</para> 
 
@@ -39,12 +39,12 @@
       (using e.g. dvdrecord from dvdrtools) as a backup (this requires
       loopback block device support in the kernel).</para>
 
-    <para os="e">Normally, you interact with lilo by using the cursor
+    <para os="e">Normally, you interact with Lilo by using the cursor
       and <literal>enter</literal> keys to select from the available
       option(s), but sometimes it is necessary to add other boot
       options, such as e.g. 'init=/bin/bash' to debug boot failures.
       The more your keyboard layout differs from the US qwerty layout,
-      the harder it becomes to type boot options unless lilo knows
+      the harder it becomes to type boot options unless Lilo knows
       about your keyboard layout. So, we will create a key table for
       Lilo (.ktl) file - at one point in the documentation these are
       referred to as .klt files, which may be a typo, but has been
@@ -116,19 +116,19 @@
 
   <note os='o'>
     <para>People who have been used to GRUB need to be aware that
-      lilo works differently - in particular, you cannot edit the
-      available choices as you can in the grub shell, and lilo records
-      the block addresses of the kernels into the boot blocks each time
-      /sbin/lilo is run. This means that when you compile a new kernel,
-      you have to add it to /etc/lilo.conf and rerun /sbin/lilo.  It
-      also means that if you recompile an existing kernel and save it
-      to the same name you still have to rerun /sbin/lilo in case it now
-      occupies different blocks on the filesystem.</para>
+      Lilo works differently - in particular, you cannot edit the
+      available choices as you can in the <command>grub</command> shell,
+      and Lilo records the block addresses of the kernels into the boot
+      blocks each time /sbin/lilo is run. This means that when you
+      compile a new kernel, you have to add it to /etc/lilo.conf and
+      rerun /sbin/lilo.  It also means that if you recompile an existing
+      kernel and save it to the same name you still have to rerun /sbin/lilo
+      in case it now occupies different blocks on the filesystem.</para>
   </note>
 
     <para os="p">If you are running multiple systems on this box and
-    using lilo, it is a good idea to ensure that each system is running
-    the same version of lilo, otherwise an old version may not be able
+    using Lilo, it is a good idea to ensure that each system is running
+    the same version of Lilo, otherwise an old version may not be able
     to overwrite the bootloader from a newer version.  You will also
     need to ensure that the copies of /etc/lilo.conf on each system are
     kept synchronised.</para>

Modified: trunk/BOOK/final-system/x86_64-64/bin86.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/bin86.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/final-system/x86_64-64/bin86.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -25,13 +25,13 @@
   <sect2 role="installation">
     <title>Installation of Bin86</title>
 
-    <para os="a">We are building bin86 because it is required to
-      compile lilo, and at the moment no other bootloader builds and runs
+    <para os="a">We are building Bin86 because it is required to
+      compile Lilo, and at the moment no other bootloader builds and runs
       on a pure64 system. If your machine has multiple systems (i.e. x86
       or multilib) you may prefer to use the bootloader from those
-      systems, such as grub.</para>
+      systems, such as GRUB.</para>
 
-    <para os="p1">This patch updates bin86 to compile on x86_64:</para>
+    <para os="p1">This patch updates Bin86 to compile on x86_64:</para>
 
 <screen os="p2"><userinput>patch -Np1 -i ../&bin86-x86_64-patch;</userinput></screen>
 

Modified: trunk/BOOK/final-system/x86_64-64/lilo.xml
===================================================================
--- trunk/BOOK/final-system/x86_64-64/lilo.xml	2006-07-11 19:46:07 UTC (rev 1968)
+++ trunk/BOOK/final-system/x86_64-64/lilo.xml	2006-07-11 19:46:25 UTC (rev 1969)
@@ -18,10 +18,10 @@
 
     <para os="a">The Lilo package contains the Linux Loader, a bootloader.</para>
 
-    <para os="b">We have chosen to use lilo because at the moment no other
+    <para os="b">We have chosen to use Lilo because at the moment no other
       bootloader builds and runs on a pure64 system. If your machine has
       multiple systems (i.e. x86 or multilib) you may prefer to use the
-      bootloader from the other system, such as grub.</para>
+      bootloader from the other system, such as GRUB.</para>
 
   </sect2>
 
@@ -39,9 +39,9 @@
 
     <para>At the end of the installation the make install process will
       print a message stating that /sbin/lilo has to be executed to
-      complete the update. Don"t do this as it has no use. The
-      /etc/lilo.conf isn"t present yet. We will complete the
-      installation of lilo in chapter 12.</para>
+      complete the update. Don't do this as it has no use. The
+      /etc/lilo.conf isn't present yet. We will complete the
+      installation of Lilo in chapter 12.</para>
 
   </sect2>
 




More information about the cross-lfs mailing list