Support for partitioned loop devices. Improved devmapper support

diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index 0433d49edc8dcfa1d23df6f2ebe9ecfac8ac5ec6..a99bee9a408ade55283c1b8caddfe6b7f0ffdce7 100644 (file)
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -32,6 +32,10 @@
 #include <stdint.h>
 #include <grub/util/misc.h>
 
+#ifdef HAVE_DEVICE_MAPPER
+# include <libdevmapper.h>
+#endif
+
 #ifdef __GNU__
 #include <hurd.h>
 #include <hurd/lookup.h>
@@ -560,30 +564,66 @@ grub_guess_root_device (const char *dir)
 }
 
 static int
-grub_util_is_dmraid (const char *os_dev)
+grub_util_is_lvm (const char *os_dev)
 {
-  if (! strncmp (os_dev, "/dev/mapper/nvidia_", 19))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/isw_", 16))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/hpt37x_", 19))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/hpt45x_", 19))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/via_", 16))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/lsi_", 16))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/pdc_", 16))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/jmicron_", 20))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/asr_", 16))
-    return 1;
-  else if (! strncmp (os_dev, "/dev/mapper/sil_", 16))
-    return 1;
+  if ((strncmp ("/dev/mapper/", os_dev, 12) != 0))
+    return 0;
+  
+#ifdef HAVE_DEVICE_MAPPER
+  {
+    struct dm_tree *tree;
+    uint32_t maj, min;
+    struct dm_tree_node *node = NULL, *child;
+    void *handle;
+    const char *node_uuid, *mapper_name = NULL, *child_uuid, *child_name;
+    struct stat st;
+
+    if (stat (os_dev, &st) < 0)
+      return 0;
 
-  return 0;
+    tree = dm_tree_create ();
+    if (! tree)
+      {
+       grub_printf ("Failed to create tree\n");
+       grub_dprintf ("hostdisk", "dm_tree_create failed\n");
+       return 0;
+      }
+
+    maj = major (st.st_rdev);
+    min = minor (st.st_rdev);
+
+    if (! dm_tree_add_dev (tree, maj, min))
+      {
+       grub_dprintf ("hostdisk", "dm_tree_add_dev failed\n");
+       dm_tree_free (tree);
+       return 0;
+      }
+
+    node = dm_tree_find_node (tree, maj, min);
+    if (! node)
+      {
+       grub_dprintf ("hostdisk", "dm_tree_find_node failed\n");
+       dm_tree_free (tree);
+       return 0;
+      }
+    node_uuid = dm_tree_node_get_uuid (node);
+    if (! node_uuid)
+      {
+       grub_dprintf ("hostdisk", "%s has no DM uuid\n", os_dev);
+       dm_tree_free (tree);
+       return 0;
+      }
+    if (strncmp (node_uuid, "LVM-", 4) != 0)
+      {
+       dm_tree_free (tree);
+       return 0;
+      }
+    dm_tree_free (tree);
+    return 1;
+  }
+#else
+  return 1;
+#endif /* HAVE_DEVICE_MAPPER */
 }
 
 int
@@ -595,9 +635,7 @@ grub_util_get_dev_abstraction (const char *os_dev __attribute__((unused)))
     return GRUB_DEV_ABSTRACTION_NONE;
 
   /* Check for LVM.  */
-  if (!strncmp (os_dev, "/dev/mapper/", 12)
-      && ! grub_util_is_dmraid (os_dev)
-      && strncmp (os_dev, "/dev/mapper/mpath", 17) != 0)
+  if (grub_util_is_lvm (os_dev))
     return GRUB_DEV_ABSTRACTION_LVM;
 
   /* Check for RAID.  */

diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 12dbe7469ba8c83de913b1fd5cf61b349b350399..2a798a3cdc4305a7cd2d4c3aba5bd51c2537fabc 100644 (file)
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1035,6 +1035,55 @@ make_device_name (int drive, int dos_part, int bsd_part)
   return ret;
 }
 
+#ifdef HAVE_DEVICE_MAPPER
+static int
+grub_util_get_dm_node_linear_info (const char *dev,
+                                  int *maj, int *min)
+{
+  struct dm_task *dmt;
+  void *next = NULL;
+  uint64_t length, start;
+  char *target, *params;
+  const char *node_name;
+  char *ptr;
+  int major, minor;
+
+  dmt = dm_task_create(DM_DEVICE_TABLE);
+  if (!dmt)
+    return 0;
+  
+  if (!dm_task_set_name(dmt, dev))
+    return 0;
+  dm_task_no_open_count(dmt);
+  if (!dm_task_run(dmt))
+    return 0;
+  next = dm_get_next_target(dmt, next, &start, &length,
+                           &target, &params);
+  if (grub_strcmp (target, "linear") != 0)
+    return 0;
+  major = grub_strtoul (params, &ptr, 10);
+  if (grub_errno)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+  if (*ptr != ':')
+    return 0;
+  ptr++;
+  minor = grub_strtoul (ptr, 0, 10);
+  if (grub_errno)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+  if (maj)
+    *maj = major;
+  if (min)
+    *min = minor;
+  return 1;
+}
+#endif
+
 static char *
 convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 {
@@ -1211,9 +1260,29 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
              node = NULL;
              goto devmapper_out;
            }
-         else if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+         if (strncmp (node_uuid, "LVM-", 4) == 0)
            {
+             grub_dprintf ("hostdisk", "%s is an LVM\n", path);
+             node = NULL;
+             goto devmapper_out;
+           }
+         if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+           {
+             int major, minor;
+             const char *node_name;
              grub_dprintf ("hostdisk", "%s is not DM-RAID\n", path);
+
+             if ((node_name = dm_tree_node_get_name (node))
+                 && grub_util_get_dm_node_linear_info (node_name,
+                                                       &major, &minor))
+               {
+                 if (tree)
+                   dm_tree_free (tree);
+                 free (path);
+                 char *ret = grub_find_device (NULL, (major << 8) | minor);
+                 return ret;
+               }
+
              node = NULL;
              goto devmapper_out;
            }