summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-02-21 01:44:19 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-02-21 01:44:19 (EST)
commit341f9b2aa63a3a25d0c6bf4c957e106a4a4f2e28 (patch)
tree409e21867af79c6a32cde34dfc567d1008441352
parent3610ba358397ac9c5a158052f11f7c7bf4443e7a (diff)
downloadlibreboot-341f9b2aa63a3a25d0c6bf4c957e106a4a4f2e28.zip
libreboot-341f9b2aa63a3a25d0c6bf4c957e106a4a4f2e28.tar.gz
libreboot-341f9b2aa63a3a25d0c6bf4c957e106a4a4f2e28.tar.bz2
backport 131c5f4
-rw-r--r--docs/gnulinux/grub_cbfs.html16
-rw-r--r--docs/gnulinux/grub_config.html2
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/gnulinux/grub_cbfs.html b/docs/gnulinux/grub_cbfs.html
index 75b1a40..41f96ed 100644
--- a/docs/gnulinux/grub_cbfs.html
+++ b/docs/gnulinux/grub_cbfs.html
@@ -103,34 +103,34 @@
<p>
By default, GRUB in libreboot is configured to scan all partitions on the main storage
- for /boot/grub/libreboot_grub.cfg or /grub/libreboot_grub.cfg(for systems where /boot
+ for /boot/grub/coreboot_grub.cfg or /grub/coreboot_grub.cfg(for systems where /boot
is on a dedicated partition), and then use it automatically.
</p>
<p>
- Simply create your custom GRUB configuration and save it to <b>/boot/grub/libreboot_grub.cfg</b>
+ Simply create your custom GRUB configuration and save it to <b>/boot/grub/coreboot_grub.cfg</b>
on the running system. The next time you boot, GRUB (in libreboot) will automatically switch to
this configuration file. <b>This means that you do not have to re-flash, recompile or otherwise
modify libreboot at all!</b>
</p>
<p>
- Ideally, your distribution should automatically generate a libreboot_grub.cfg file that is written
+ Ideally, your distribution should automatically generate a coreboot_grub.cfg file that is written
specifically under the assumption that it will be read and used on a libreboot system that uses
GRUB as a payload. If your distribution does not do this, then you can try to add that feature
yourself or politely ask someone involved with or otherwise knowledgeable about the distribution
- to do it for you. The libreboot_grub.cfg could either contain the full configuration, or it could
+ to do it for you. The coreboot_grub.cfg could either contain the full configuration, or it could
chainload another GRUB ELF executable (built to be used as a coreboot payload) that is located in
a partition on the main storage.
</p>
<p>
- If you want to adapt a copy of the existing <i>libreboot</i> GRUB configuration and use that for the libreboot_grub.cfg file, then
+ If you want to adapt a copy of the existing <i>libreboot</i> GRUB configuration and use that for the coreboot_grub.cfg file, then
follow <a href="#tools">#tools</a>, <a href="#rom">#rom</a> and
<a href="#extract_testconfig">#extract_testconfig</a> to get the <b><i>grubtest.cfg</i></b>.
- Rename <b><i>grubtest.cfg</i></b> to <b><i>libreboot_grub.cfg</i></b> and save it to <b><i>/boot/grub/</i></b>
+ Rename <b><i>grubtest.cfg</i></b> to <b><i>coreboot_grub.cfg</i></b> and save it to <b><i>/boot/grub/</i></b>
on the running system where it is intended to be used. Modify the file at that location however you see fit,
- and then stop reading this guide (the rest of this page is irrelevant to you); <b>in libreboot_grub.cfg on disk,
- if you are adapting it based on grub.cfg from CBFS then remove the check for libreboot_grub.cfg otherwise it will loop.</b>.
+ and then stop reading this guide (the rest of this page is irrelevant to you); <b>in coreboot_grub.cfg on disk,
+ if you are adapting it based on grub.cfg from CBFS then remove the check for coreboot_grub.cfg otherwise it will loop.</b>.
</p>
<p>
diff --git a/docs/gnulinux/grub_config.html b/docs/gnulinux/grub_config.html
index 9cc0d77..02feabd 100644
--- a/docs/gnulinux/grub_config.html
+++ b/docs/gnulinux/grub_config.html
@@ -55,7 +55,7 @@
<p>
Then do this as root:<br/>
$ <b>cd /boot/grub/</b><br/>
- $ <b>ln -s grub.cfg libreboot_grub.cfg</b>
+ $ <b>ln -s grub.cfg coreboot_grub.cfg</b>
</p>
<p>
After that, your system should then boot automatically.