From ecf9b30ae7f88458e646d6331a30b4c95b587741 Mon Sep 17 00:00:00 2001 From: Jookia <166291@gmail.com> Date: Thu, 04 Feb 2016 04:45:49 -0500 Subject: grub.cfg: Search in lvm/matrix-root and lvm/matrix-boot. --- (limited to 'resources/grub') 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 -- cgit v0.9.1