diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-08 15:53:46 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-08 15:53:46 +0100 |
| commit | b525833f42ddb15b00222838cde79d6378d38c0e (patch) | |
| tree | 38de99aa5156e91677ba2e890ed003e118216efa | |
| parent | d9e8923ff4e58ecd182dbb3b8eb6b6fe657e6eb5 (diff) | |
| parent | fe926052441151722886edb5693a961342b3aa9e (diff) | |
Merge branch 'master' into 25.04_branch
| -rw-r--r-- | config/grub/default/config/payload | 2 | ||||
| -rw-r--r-- | config/grub/nvme/config/payload | 2 | ||||
| -rw-r--r-- | config/grub/xhci/config/payload | 2 |
3 files changed, 3 insertions, 3 deletions
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 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 |