summaryrefslogtreecommitdiffstats
path: root/resources/grub/config
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-10-14 23:51:00 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-10-14 23:51:00 (EDT)
commit2deabf4a1da7f04683d0a0468275510bc0944477 (patch)
tree87aff6e00c744a1a3b5e1a8fd51e4363e932bdcc /resources/grub/config
parentea633dc95f6a8d45511911239638d1064b9900df (diff)
downloadlibreboot-2deabf4a1da7f04683d0a0468275510bc0944477.zip
libreboot-2deabf4a1da7f04683d0a0468275510bc0944477.tar.gz
libreboot-2deabf4a1da7f04683d0a0468275510bc0944477.tar.bz2
libreboot is not autoboot
Diffstat (limited to 'resources/grub/config')
-rw-r--r--resources/grub/config/menuentries/common.cfg8
1 files changed, 4 insertions, 4 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 8573df5..0426437 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -1,11 +1,11 @@
menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o' --hotkey='O' {
# GRUB handles (almost) every possible disk setup, but only the location of /boot is actually important,
-# since GRUB only loads the user's config. As soon as the kernel takes over, autoboot's done.
+# since GRUB only loads the user's config. As soon as the kernel takes over, libreboot's done.
# LVM, RAID, filesystems and encryption on both raw devices and partitions in all various combinations
# need to be supported. Since full disk encryption is possible with GRUB as payload and probably desired/used
-# by most users, autoboot GRUB config tries to load the operating system (kernel) in the following way:
+# by most users, libreboot GRUB config tries to load the operating system (kernel) in the following way:
# 1. Try to decrypt raw devices first. This <your disk setup> inside a LUKS container is pretty common
# a) Try LVM and RAID first, they might be used (accross multiple (raw) devices)
@@ -26,10 +26,10 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o
for d in crypto0 (crypt0,*) (lvm/*) md/0 (md0/,*) ahci0 ahci1 (ahci0,*) (ahci1,*); do
set root=${d}
# a) Check possible file locations...
- for p in boot/grub/autoboot_ grub/autoboot_ boot/grub/ grub/; do
+ for p in boot/grub/libreboot_ grub/libreboot_ boot/grub/ grub/; do
if [ -f "/${p}grub.cfg" ]; then
# b) And eventually try to load the config. Using ESC one can still exit and revert back to
- # autoboot's menu.
+ # libreboot's menu.
configfile /${p}grub.cfg
fi
done