diff options
| -rw-r--r-- | config/grub/default/config/payload | 14 | ||||
| -rw-r--r-- | config/grub/nvme/config/payload | 14 | ||||
| -rw-r--r-- | config/grub/xhci/config/payload | 14 |
3 files changed, 42 insertions, 0 deletions
diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload index 91afcc7b..3f134f1d 100644 --- a/config/grub/default/config/payload +++ b/config/grub/default/config/payload @@ -178,15 +178,29 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o search_bootcfg crypto + lvmvol="" + # after cryptomount, lvm volumes might be available # using * is slow on some machines, but we use it here, # just once. in so doing, we find every lvm volume for vol in (*); do if regexp ^lvm/ $vol; then + lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi done + # user might have put luks inside lvm + set pager=0 + echo "Attempting to unlock encrypted LVMs" + for vol in ${lvmvol}; do + cryptomount "$vol" + done + set pager=1 + echo + + search_bootcfg crypto + true # Prevent pager requiring to accept each line instead of whole screen } diff --git a/config/grub/nvme/config/payload b/config/grub/nvme/config/payload index 68e6b52a..22dd8fe1 100644 --- a/config/grub/nvme/config/payload +++ b/config/grub/nvme/config/payload @@ -190,15 +190,29 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o search_bootcfg crypto + lvmvol="" + # after cryptomount, lvm volumes might be available # using * is slow on some machines, but we use it here, # just once. in so doing, we find every lvm volume for vol in (*); do if regexp ^lvm/ $vol; then + lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi done + # user might have put luks inside lvm + set pager=0 + echo "Attempting to unlock encrypted LVMs" + for vol in ${lvmvol}; do + cryptomount "$vol" + done + set pager=1 + echo + + search_bootcfg crypto + true # Prevent pager requiring to accept each line instead of whole screen } diff --git a/config/grub/xhci/config/payload b/config/grub/xhci/config/payload index ebfd1fea..d1f81fd3 100644 --- a/config/grub/xhci/config/payload +++ b/config/grub/xhci/config/payload @@ -191,15 +191,29 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o search_bootcfg crypto + lvmvol="" + # after cryptomount, lvm volumes might be available # using * is slow on some machines, but we use it here, # just once. in so doing, we find every lvm volume for vol in (*); do if regexp ^lvm/ $vol; then + lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi done + # user might have put luks inside lvm + set pager=0 + echo "Attempting to unlock encrypted LVMs" + for vol in ${lvmvol}; do + cryptomount "$vol" + done + set pager=1 + echo + + search_bootcfg crypto + true # Prevent pager requiring to accept each line instead of whole screen } |