From a1476c24fb549aaf2702f1c9e2383b3eb90bc6ee Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 9 Nov 2023 14:34:24 -0600
Subject: image: T4516: ensure compatibility with legacy RAID 1 installs

(cherry picked from commit bd701768796d6ebb03ca943faf96d1dbea030edd)
---
 data/templates/grub/grub_common.j2 |  5 +++--
 data/templates/grub/grub_compat.j2 | 11 ++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'data/templates')

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 %}
-- 
cgit v1.2.3