From e084b06dc767af37870b05139598b56a41872d1f Mon Sep 17 00:00:00 2001 From: cqst Date: Thu, 8 May 2025 02:28:14 -0700 Subject: fix trying to boot all logical volumes after unlocking an encrypted volume --- config/grub/default/config/payload | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload index 3f134f1d..3d84413e 100644 --- a/config/grub/default/config/payload +++ b/config/grub/default/config/payload @@ -184,7 +184,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o # 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 + if regexp ^\\(lvm/ $vol; then lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi -- cgit v1.2.1 From fe926052441151722886edb5693a961342b3aa9e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 8 May 2025 11:12:34 +0100 Subject: also fix the other grub trees Signed-off-by: Leah Rowe --- config/grub/nvme/config/payload | 2 +- config/grub/xhci/config/payload | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/grub/nvme/config/payload b/config/grub/nvme/config/payload index 22dd8fe1..4f3de36e 100644 --- a/config/grub/nvme/config/payload +++ b/config/grub/nvme/config/payload @@ -196,7 +196,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o # 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 + if regexp ^\\(lvm/ $vol; then lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi diff --git a/config/grub/xhci/config/payload b/config/grub/xhci/config/payload index d1f81fd3..9db22fe2 100644 --- a/config/grub/xhci/config/payload +++ b/config/grub/xhci/config/payload @@ -197,7 +197,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o # 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 + if regexp ^\\(lvm/ $vol; then lvmvol="${lvmvol} ${vol}" try_bootcfg "${vol}" fi -- cgit v1.2.1