Fix DMRAID partition handling.

diff --git a/ChangeLog b/ChangeLog
index db6076cfd91b592a56171ea3938bb5aee71f83a6..2dcf1f514dfc3bc8306cd0568442884e3e5b40ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix DMRAID partition handling.
+
 2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * tests/grub_cmd_date.in: Skip on sparc64.

diff --git a/util/getroot.c b/util/getroot.c
index 4ea8e65c9f324feac31c6b900e66a7aaf61532e7..ecf7ce19958ee0af9efd9b703c774dbea96f0b81 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -1956,6 +1956,7 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
              grub_util_info ("dm_tree_find_node failed");
              goto devmapper_out;
            }
+       reiterate:
          node_uuid = dm_tree_node_get_uuid (node);
          if (! node_uuid)
            {
@@ -2030,6 +2031,9 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
              goto devmapper_out;
            }
          mapper_name = child_name;
+         *is_part = 1;
+         node = child;
+         goto reiterate;
 
 devmapper_out:
          if (! mapper_name && node)