diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-10-06 18:40:30 (EDT) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-10-06 18:40:30 (EDT) |
| commit | d0c54b9ca11bdcae0b179d21028c722aeb9f9095 (patch) | |
| tree | 22d697beda08ef82b9ad568528c410d54fc65fbc /resources/grub | |
| parent | 5dad7b53413384d1a93180dacbc51f3480bb3300 (diff) | |
| download | libreboot-d0c54b9ca11bdcae0b179d21028c722aeb9f9095.zip libreboot-d0c54b9ca11bdcae0b179d21028c722aeb9f9095.tar.gz libreboot-d0c54b9ca11bdcae0b179d21028c722aeb9f9095.tar.bz2 | |
grub.cfg: replace autoboot with libreboot
kl3 told me to do it before pushing the last patch, but I wasn't
concentrating and didn't see his message
Diffstat (limited to 'resources/grub')
| -rw-r--r-- | resources/grub/config/menuentries/common.cfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg index 1d6c813..8a48dec 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) @@ -20,10 +20,10 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o # hirachy stays the same. 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 @@ -39,7 +39,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o # therefore already scanned volumes as well) for d in crypto0 (crypt0,*) (lvm/*); do set root=${d} - 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 configfile /${p}grub.cfg fi |