ressources/grub, website: add LVM2 support (fix bug #65663 "No support for LVM2").
This commit fixes a bug causing the GRUB2 payload not finding LVM2 partitions. See https://savannah.gnu.org/bugs/index.php?65663 Reported-by: WodeShengli <wodeshengli@disroot.org> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> Acked-by: Adrien Bourmault <neox@gnu.org>
This commit is contained in:
parent
f55201d2f3
commit
860b00bf1e
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (C) 2013 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
# Copyright (C) 2013, 2024 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
|
||||||
# Copyright (C) 2013-2016, 2020-2021 Leah Rowe <leah@libreboot.org>
|
# Copyright (C) 2013-2016, 2020-2021 Leah Rowe <leah@libreboot.org>
|
||||||
# Copyright (C) 2021 Vitali64 <vitali64pmemail@protonmail.com>
|
# Copyright (C) 2021 Vitali64 <vitali64pmemail@protonmail.com>
|
||||||
# Copyright (C) 2023 Adrien 'neox' Bourmault <neox@gnu.org>
|
# Copyright (C) 2023 Adrien 'neox' Bourmault <neox@gnu.org>
|
||||||
|
@ -102,18 +102,18 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
|
||||||
search_grub ata
|
search_grub ata
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# grub device enumeration is very slow, so checks are hardcoded
|
for device in (*) ; do
|
||||||
|
if regexp ^lvm/ $device ; then
|
||||||
# TODO: add more strings, based on what distros set up when
|
try_user_config "${device}"
|
||||||
# the user select auto-partitioning on those installers
|
fi
|
||||||
lvmvol="lvm/matrix-bootvol lvm/matrix-rootvol"
|
done
|
||||||
|
|
||||||
raidvol="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9"
|
raidvol="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9"
|
||||||
|
|
||||||
# in practise, doing multiple redundant checks is perfectly fast and
|
# in practise, doing multiple redundant checks is perfectly fast and
|
||||||
# TODO: optimize grub itself, and use */? here for everything
|
# TODO: optimize grub itself, and use */? here for everything
|
||||||
|
|
||||||
for vol in ${lvmvol} ${raidvol} ; do
|
for vol in ${raidvol} ; do
|
||||||
try_user_config "${vol}"
|
try_user_config "${vol}"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
@ -132,15 +132,25 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o
|
||||||
|
|
||||||
set pager=0
|
set pager=0
|
||||||
echo -n "Attempting to unlock encrypted volumes"
|
echo -n "Attempting to unlock encrypted volumes"
|
||||||
for dev in ${ahcidev} ${atadev} ${lvmvol} ${raidvol}; do
|
for dev in ${ahcidev} ${atadev} ${raidvol}; do
|
||||||
if cryptomount "${dev}" ; then break ; fi
|
if cryptomount "${dev}" ; then break ; fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
for device in (*) ; do
|
||||||
|
if regexp ^lvm/ $dev ; then
|
||||||
|
if cryptomount "${dev}" ; then break ; fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
set pager=1
|
set pager=1
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# after cryptomount, lvm volumes might be available
|
# after cryptomount, lvm volumes might be available
|
||||||
for vol in ${lvmvol}; do
|
for device in (*) ; do
|
||||||
try_user_config "${vol}"
|
if regexp ^lvm/ $device ; then
|
||||||
|
try_user_config "${device}"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
search_grub crypto
|
search_grub crypto
|
||||||
|
|
|
@ -421,8 +421,6 @@ Limitations
|
||||||
+------------------+----------------------------------------+---------------------------------------------------------+
|
+------------------+----------------------------------------+---------------------------------------------------------+
|
||||||
| Component | Limitations | Bug number |
|
| Component | Limitations | Bug number |
|
||||||
+------------------+----------------------------------------+---------------------------------------------------------+
|
+------------------+----------------------------------------+---------------------------------------------------------+
|
||||||
| GRUB images | - No support for LVM2 | [#65663](https://savannah.gnu.org/bugs/index.php?65663) |
|
|
||||||
+------------------+----------------------------------------+---------------------------------------------------------+
|
|
||||||
| SeaBIOS images | - No VGA support | [#65922](https://savannah.gnu.org/bugs/index.php?65922) |
|
| SeaBIOS images | - No VGA support | [#65922](https://savannah.gnu.org/bugs/index.php?65922) |
|
||||||
| | => Require to edit /etc/default/grub | |
|
| | => Require to edit /etc/default/grub | |
|
||||||
+------------------+----------------------------------------+---------------------------------------------------------+
|
+------------------+----------------------------------------+---------------------------------------------------------+
|
||||||
|
|
Loading…
Reference in New Issue