From a9836b9de95ae05f5d057746dea0d052d8fabaa4 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Mon, 1 Apr 2024 15:41:03 +0800
Subject: [PATCH 026/272] Fix grub2-mkconfig warning when disk is LVM PV

When a disk device was found in grub_util_biosdisk_get_grub_dev, its grub
hostdisk device name just returned. Since the disk could also be used as PV
disk, use grub_util_get_ldm to kick scanning of on disk metadata and adding it
to VG array.
---
 util/getroot.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/util/getroot.c b/util/getroot.c
index 75a7d5f21..e42e945ff 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -272,8 +272,28 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   grub_util_info ("%s is a parent of %s", sys_disk, os_dev);
   if (!is_part)
     {
+#if defined(__APPLE__)
       free (sys_disk);
       return make_device_name (drive);
+#else
+      char *name, *ldm_name;
+      grub_disk_t disk;
+
+      free (sys_disk);
+      name = make_device_name (drive);
+      disk = grub_disk_open (name);
+      if (!disk)
+        return name;
+      ldm_name = grub_util_get_ldm (disk, 0);
+      if (ldm_name)
+        {
+	  grub_disk_close (disk);
+          grub_free (name);
+	  return ldm_name;
+        }
+      grub_disk_close (disk);
+      return name;
+#endif
     }
   free (sys_disk);
 
-- 
2.41.0