summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorJookia <166291@gmail.com>2016-02-04 04:45:49 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-02-04 06:15:18 (EST)
commitecf9b30ae7f88458e646d6331a30b4c95b587741 (patch)
tree32571d65cce8dc0dabd4aca4404a63b922c921d5 /resources
parent1de6fcf679ef485de5395f97767989993bcd9f1d (diff)
downloadlibreboot-ecf9b30ae7f88458e646d6331a30b4c95b587741.zip
libreboot-ecf9b30ae7f88458e646d6331a30b4c95b587741.tar.gz
libreboot-ecf9b30ae7f88458e646d6331a30b4c95b587741.tar.bz2
grub.cfg: Search in lvm/matrix-root and lvm/matrix-boot.
Diffstat (limited to 'resources')
-rw-r--r--resources/grub/config/menuentries/common.cfg6
1 files changed, 6 insertions, 0 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 980a1a5..b1e3c9c 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -47,6 +47,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
switch_to_grub_config "${d},${j}"
done
done
+ for l in lvm/matrix-root lvm/matrix-boot; do
+ switch_to_grub_config ${l}
+ done
# prompt user for passphrase if LUKS header is found but try using external keyfiles first
search -n -f /keyfile --set=kf --hint usb0, --hint usb1,
@@ -61,6 +64,9 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
for j in 1 2 3 4 5 6 7 8 9; do
switch_to_grub_config "crypto0,${j}"
done
+ for l in lvm/matrix-root lvm/matrix-boot; do
+ switch_to_grub_config ${l}
+ done
# 3. Last resort, if none of the above succeeds, all you have is GRUB's shell
set root=ahci0,1