diff options
| author | John Estabrook <jestabro@vyos.io> | 2023-11-09 14:34:24 -0600 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2023-12-16 20:37:10 -0600 |
| commit | a1476c24fb549aaf2702f1c9e2383b3eb90bc6ee (patch) | |
| tree | 3c906dadfbfc1c3d3b072cef2140fbc8a903ff9a /data/templates/grub | |
| parent | a41d2c01295bed792c376aa817ac06365cc8a7a5 (diff) | |
| download | vyos-1x-a1476c24fb549aaf2702f1c9e2383b3eb90bc6ee.tar.gz vyos-1x-a1476c24fb549aaf2702f1c9e2383b3eb90bc6ee.zip | |
image: T4516: ensure compatibility with legacy RAID 1 installs
(cherry picked from commit bd701768796d6ebb03ca943faf96d1dbea030edd)
Diffstat (limited to 'data/templates/grub')
| -rw-r--r-- | data/templates/grub/grub_common.j2 | 5 | ||||
| -rw-r--r-- | data/templates/grub/grub_compat.j2 | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/data/templates/grub/grub_common.j2 b/data/templates/grub/grub_common.j2 index 78df3f48c..278ffbf2c 100644 --- a/data/templates/grub/grub_common.j2 +++ b/data/templates/grub/grub_common.j2 @@ -18,5 +18,6 @@ function setup_serial { setup_serial -# find root device -#search --no-floppy --fs-uuid --set=root ${root_uuid} +{% if search_root %} +{{ search_root }} +{% endif %} diff --git a/data/templates/grub/grub_compat.j2 b/data/templates/grub/grub_compat.j2 index 935172005..887d5d0bd 100644 --- a/data/templates/grub/grub_compat.j2 +++ b/data/templates/grub/grub_compat.j2 @@ -45,9 +45,14 @@ serial --unit=0 --speed=115200 {% endif %} terminal_output --append serial terminal_input serial console -{% if efi %} -insmod efi_gop -insmod efi_uga +{% for mod in modules %} +insmod {{ mod }} +{% endfor %} +{% if root %} +set root={{ root }} +{% endif %} +{% if search_root %} +{{ search_root }} {% endif %} {% for v in versions %} |