diff options
| -rw-r--r-- | chapter03/packages.xml | 2 | ||||
| -rw-r--r-- | chapter06/grub.xml | 14 | ||||
| -rw-r--r-- | chapter08/grub.xml | 30 | ||||
| -rw-r--r-- | chapter08/introduction.xml | 2 | ||||
| -rw-r--r-- | chapter09/reboot.xml | 2 |
5 files changed, 25 insertions, 25 deletions
diff --git a/chapter03/packages.xml b/chapter03/packages.xml index a7c31f1e9..8994bd1bd 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -165,7 +165,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note> </varlistentry> <varlistentry> -<term>Grub (&grub-version;) - 949 KB:</term> +<term>GRUB (&grub-version;) - 949 KB:</term> <listitem> <para><ulink url="&alpha-gnu;grub/"/></para> </listitem> diff --git a/chapter06/grub.xml b/chapter06/grub.xml index eeb5f2caf..2e4c9a2d2 100644 --- a/chapter06/grub.xml +++ b/chapter06/grub.xml @@ -6,13 +6,13 @@ %patches-entities; ]> <sect1 id="ch-system-grub" role="wrap"> -<title>Grub-&grub-version;</title> +<title>GRUB-&grub-version;</title> <?dbhtml filename="grub.html"?> -<indexterm zone="ch-system-grub"><primary sortas="a-Grub">Grub</primary></indexterm> +<indexterm zone="ch-system-grub"><primary sortas="a-Grub">GRUB</primary></indexterm> <sect2 role="package"><title/> -<para>The Grub package contains the Grand Unified Bootloader.</para> +<para>The GRUB package contains the GRand Unified Bootloader.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> @@ -28,16 +28,16 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem> </sect2> <sect2 role="installation"> -<title>Installation of Grub</title> +<title>Installation of GRUB</title> <para>This package is known to have issues when its default optimization flags (including the <parameter>-march</parameter> and <parameter>-mcpu</parameter> options) are changed. If any environment variables that override default optimizations have been defined, such as <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>, -unset them when building Grub.</para> +unset them when building GRUB.</para> -<para>Prepare Grub for compilation:</para> +<para>Prepare GRUB for compilation:</para> <screen><userinput>./configure --prefix=/usr</userinput></screen> @@ -74,7 +74,7 @@ copy the <filename>e2fs_stage1_5</filename> and/or </sect2> -<sect2 id="contents-grub" role="content"><title>Contents of Grub</title> +<sect2 id="contents-gRUB" role="content"><title>Contents of GRUB</title> <segmentedlist> <segtitle>Installed programs</segtitle> diff --git a/chapter08/grub.xml b/chapter08/grub.xml index d962d4e6f..d9e7325f1 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -8,7 +8,7 @@ <?dbhtml filename="grub.html"?> <indexterm zone="ch-bootable-grub"> -<primary sortas="a-Grub">Grub</primary> +<primary sortas="a-Grub">GRUB</primary> <secondary>configuring</secondary></indexterm> <para>Your shiny new LFS system is almost complete. One of the last @@ -25,10 +25,10 @@ bootable. Make sure that an emergency boot disk is ready to <quote>rescue</quote> the computer if the computer becomes unusable (un-bootable).</para> -<para>Earlier, we compiled and installed the Grub boot loader software +<para>Earlier, we compiled and installed the GRUB boot loader software in preparation for this step. The procedure involves writing some -special Grub files to specific locations on the hard drive. We highly -recommend creating a Grub boot floppy diskette as a backup. Insert a +special GRUB files to specific locations on the hard drive. We highly +recommend creating a GRUB boot floppy diskette as a backup. Insert a blank floppy diskette and run the following commands:</para> <screen><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1 @@ -39,13 +39,13 @@ dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen> <screen><userinput>grub</userinput></screen> -<para>Grub uses its own naming structure for drives and partitions in +<para>GRUB uses its own naming structure for drives and partitions in the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis> is the hard drive number and <emphasis>m</emphasis> is the partition number, both starting from zero. For example, partition <filename class="partition">hda1</filename> is <emphasis>(hd0,0)</emphasis> to -Grub and <filename class="partition">hdb3</filename> is -<emphasis>(hd1,2)</emphasis>. In contrast to Linux, Grub does not +GRUB and <filename class="partition">hdb3</filename> is +<emphasis>(hd1,2)</emphasis>. In contrast to Linux, GRUB does not consider CD-ROM drives to be hard drives. For example, if using a CD on <filename class="partition">hdb</filename> and a second hard drive on <filename class="partition">hdc</filename>, that second hard drive @@ -57,9 +57,9 @@ one is used). For the following example, it is assumed that the root (or separate boot) partition is <filename class="partition">hda4</filename>.</para> -<para>Tell Grub where to search for its +<para>Tell GRUB where to search for its <filename>stage{1,2}</filename> files. The Tab key can be used -everywhere to make Grub show the alternatives:</para> +everywhere to make GRUB show the alternatives:</para> <screen><userinput>root (hd0,3)</userinput></screen> @@ -67,22 +67,22 @@ everywhere to make Grub show the alternatives:</para> loader. Do not run the command if this is not desired, for example, if using a third party boot manager to manage the Master Boot Record (MBR). In this scenario, it would make more sense to install -Grub into the <quote>boot sector</quote> of the LFS partition. In this +GRUB into the <quote>boot sector</quote> of the LFS partition. In this case, this next command would become <userinput>setup (hd0,3)</userinput>.</para></warning> -<para>Tell Grub to install itself into the MBR of +<para>Tell GRUB to install itself into the MBR of <filename class="partition">hda</filename>:</para> <screen><userinput>setup (hd0)</userinput></screen> -<para>If all went well, Grub will have reported finding its files in +<para>If all went well, GRUB will have reported finding its files in <filename class="directory">/boot/grub</filename>. That's all there is to it. Quit the <command>grub</command> shell:</para> <screen><userinput>quit</userinput></screen> -<para>Create a <quote>menu list</quote> file defining Grub's boot menu:</para> +<para>Create a <quote>menu list</quote> file defining GRUB's boot menu:</para> <screen><userinput>cat > /boot/grub/menu.lst << "EOF" <literal># Begin /boot/grub/menu.lst @@ -122,10 +122,10 @@ chainloader +1</literal> EOF</userinput></screen> <para>If <command>info grub</command> does not provide all necessary material, additional -information regarding Grub is located on its website at: +information regarding GRUB is located on its website at: <ulink url="http://www.gnu.org/software/grub/"/>.</para> -<para>The FHS stipulates that Grub's <filename>menu.lst</filename> file should be symlinked to +<para>The FHS stipulates that GRUB's <filename>menu.lst</filename> file should be symlinked to <filename class="symlink">/etc/grub/menu.lst</filename>. To satisfy this requirement, issue the following command:</para> diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml index 6fa80cadc..95bb37f7d 100644 --- a/chapter08/introduction.xml +++ b/chapter08/introduction.xml @@ -9,7 +9,7 @@ <para>It is time to make the LFS system bootable. This chapter discusses creating an <filename>fstab</filename> file, building a -kernel for the new LFS system, and installing the Grub boot loader so +kernel for the new LFS system, and installing the GRUB boot loader so that the LFS system can be selected for booting at startup.</para> </sect1> diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml index 66fd16338..95e6804a4 100644 --- a/chapter09/reboot.xml +++ b/chapter09/reboot.xml @@ -50,7 +50,7 @@ umount $LFS</userinput></screen> <screen><userinput>shutdown -r now</userinput></screen> -<para>Assuming the Grub boot loader was set up as outlined earlier, the menu +<para>Assuming the GRUB boot loader was set up as outlined earlier, the menu is set to boot <emphasis>LFS &version;</emphasis> automatically.</para> <para>When the reboot is complete, the LFS system is ready for use and |