Changeset 229ed25 for BOOK/bootable/x86/grub.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/bootable/x86/grub.xml (modified) (2 diffs)

BOOK/bootable/x86/grub.xml

@@ -29 +29 @@
   the computer if the computer becomes unusable (un-bootable).</para>
 
-  <para os="c">The first thing we need to do is generate a configuration for
-  GRUB. In previous versions of grub we could create the configuration manually
-  here, but with GRUB2 we can generate <filename>grub.cfg</filename>
-  automatically. You can do this with the following command:</para>
-
-<screen os="d"><userinput>grub-mkconfig -o /boot/grub/grub.cfg</userinput></screen>
-
   <warning os="w1">
     <para>The following command will overwrite the current boot loader.
@@ -51 +44 @@
 <screen os="f"><userinput>grub-install /dev/sda</userinput></screen>
 
+  <para os="c">Next, we need to generate a configuration for GRUB.
+  In previous versions of grub we could create the configuration manually
+  here, but with GRUB2 we can generate <filename>grub.cfg</filename>
+  automatically. You can do this with the following command:</para>
+
+<screen os="d"><userinput>grub-mkconfig -o /boot/grub/grub.cfg</userinput></screen>
+
 </sect1>