summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'docs/grub-2-guide.xml')
-rw-r--r--docs/grub-2-guide.xml128
1 files changed, 64 insertions, 64 deletions
diff --git a/docs/grub-2-guide.xml b/docs/grub-2-guide.xml
index a28bea3..a0d1e8f 100644
--- a/docs/grub-2-guide.xml
+++ b/docs/grub-2-guide.xml
@@ -177,70 +177,7 @@ failed.
</section>
<section>
-<title>Configuring GRUB 2</title>
-<body>
-
-<impo>
-Gentoo installs all grub commands renamed to grub2. So if you read any other guide you
-should replace all grub mentions with grub2 <i>(grub-mkconfig -> grub2-mkconfig)</i>.
-</impo>
-
-<p>
-Compared to GRUB Legacy, GRUB 2 uses automatic generation to generate
-all the required entries for you to boot. This is handled by <i>grub2-mkconfig</i>
-command that probes your system for all the required data. Cooperating with
-<i>sys-boot/os-prober</i>, it detects even other OSes on all disks.
-</p>
-
-<impo>
-If you updated from GRUB Legacy then your <path>/boot/grub/menu.lst</path>
-was converted to <path>/boot/grub2/grub.cfg</path> to ensure that your system
-can boot even if you forget to generate the config. Never the less you should
-take time and migrate the configuration to be automatically generated, because
-next time GRUB 2 is installed it will use automatic generation and ignore
-GRUB Legacy files.
-</impo>
-
-<pre caption="Generating the GRUB 2 config">
-grub2-mkconfig -o /boot/grub2/grub.cfg
-</pre>
-
-<p>
-Tweaking the options is to be done in the <path>/etc/defaults/grub</path> file.
-Simple text file configuration with description of some default values.
-All the options are described in grub2 info pages.
-</p>
-
-<note>
-This file is created by Gentoo and if you find an interesting option not used
-in there just open a bugreport (possibly with a patch).
-</note>
-
-<p>
-Sometimes, if automatic detection of GRUB 2 does not suffice, the file <path>
-/etc/grub.d/40_custom</path> should be used to store custom entries. Full
-description how to configure such with examples can be found in grub2 info
-pages.
-</p>
-
-<pre caption="Custom menu entry">
-menuentry "My Shiny Gentoo Kernel" {
- set root=(hd0,1)
- search --no-floppy --fs-uuid --set &lt;UUID&gt;
- linux /boot/gentookernel-5.3.2-generic root=UUID=&lt;UUID&gt;
- initrd /boot/initrd.img-5.3.2
-}
-</pre>
-
-<warn>
-Remember to replace the <i>&lt;UUID&gt;</i> with your device UUID.
-</warn>
-
-</body>
-</section>
-
-<section>
-<title>Pre-Configuring GRUB 2 to use EFI</title>
+<title>Variant B: Pre-Configuring GRUB 2 to use EFI</title>
<body>
<p>
@@ -356,6 +293,69 @@ configuration.
</section>
<section>
+<title>Configuring GRUB 2</title>
+<body>
+
+<impo>
+Gentoo installs all grub commands renamed to grub2. So if you read any other guide you
+should replace all grub mentions with grub2 <i>(grub-mkconfig -> grub2-mkconfig)</i>.
+</impo>
+
+<p>
+Compared to GRUB Legacy, GRUB 2 uses automatic generation to generate
+all the required entries for you to boot. This is handled by <i>grub2-mkconfig</i>
+command that probes your system for all the required data. Cooperating with
+<i>sys-boot/os-prober</i>, it detects even other OSes on all disks.
+</p>
+
+<impo>
+If you updated from GRUB Legacy then your <path>/boot/grub/menu.lst</path>
+was converted to <path>/boot/grub2/grub.cfg</path> to ensure that your system
+can boot even if you forget to generate the config. Never the less you should
+take time and migrate the configuration to be automatically generated, because
+next time GRUB 2 is installed it will use automatic generation and ignore
+GRUB Legacy files.
+</impo>
+
+<pre caption="Generating the GRUB 2 config">
+grub2-mkconfig -o /boot/grub2/grub.cfg
+</pre>
+
+<p>
+Tweaking the options is to be done in the <path>/etc/defaults/grub</path> file.
+Simple text file configuration with description of some default values.
+All the options are described in grub2 info pages.
+</p>
+
+<note>
+This file is created by Gentoo and if you find an interesting option not used
+in there just open a bugreport (possibly with a patch).
+</note>
+
+<p>
+Sometimes, if automatic detection of GRUB 2 does not suffice, the file <path>
+/etc/grub.d/40_custom</path> should be used to store custom entries. Full
+description how to configure such with examples can be found in grub2 info
+pages.
+</p>
+
+<pre caption="Custom menu entry">
+menuentry "My Shiny Gentoo Kernel" {
+ set root=(hd0,1)
+ search --no-floppy --fs-uuid --set &lt;UUID&gt;
+ linux /boot/gentookernel-5.3.2-generic root=UUID=&lt;UUID&gt;
+ initrd /boot/initrd.img-5.3.2
+}
+</pre>
+
+<warn>
+Remember to replace the <i>&lt;UUID&gt;</i> with your device UUID.
+</warn>
+
+</body>
+</section>
+
+<section>
<title>Configuring with LVM</title>
<body>