dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0317-Fix-DMRAID-partition-handling.patch

f96e0b
From 0b3feb00d9d845ab95f2640c0f0336fd5a663d8d Mon Sep 17 00:00:00 2001
f96e0b
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
f96e0b
Date: Mon, 15 Apr 2013 08:37:13 +0200
f96e0b
Subject: [PATCH 317/482] 	Fix DMRAID partition handling.
f96e0b
f96e0b
---
f96e0b
 ChangeLog      | 4 ++++
f96e0b
 util/getroot.c | 4 ++++
f96e0b
 2 files changed, 8 insertions(+)
f96e0b
f96e0b
diff --git a/ChangeLog b/ChangeLog
f96e0b
index db6076c..2dcf1f5 100644
f96e0b
--- a/ChangeLog
f96e0b
+++ b/ChangeLog
f96e0b
@@ -1,5 +1,9 @@
f96e0b
 2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
 
f96e0b
+	Fix DMRAID partition handling.
f96e0b
+
f96e0b
+2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
+
f96e0b
 	* tests/grub_cmd_date.in: Skip on sparc64.
f96e0b
 
f96e0b
 2013-04-15  Vladimir Serbinenko  <phcoder@gmail.com>
f96e0b
diff --git a/util/getroot.c b/util/getroot.c
f96e0b
index 4ea8e65..ecf7ce1 100644
f96e0b
--- a/util/getroot.c
f96e0b
+++ b/util/getroot.c
f96e0b
@@ -1956,6 +1956,7 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
f96e0b
 	      grub_util_info ("dm_tree_find_node failed");
f96e0b
 	      goto devmapper_out;
f96e0b
 	    }
f96e0b
+	reiterate:
f96e0b
 	  node_uuid = dm_tree_node_get_uuid (node);
f96e0b
 	  if (! node_uuid)
f96e0b
 	    {
f96e0b
@@ -2030,6 +2031,9 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st,
f96e0b
 	      goto devmapper_out;
f96e0b
 	    }
f96e0b
 	  mapper_name = child_name;
f96e0b
+	  *is_part = 1;
f96e0b
+	  node = child;
f96e0b
+	  goto reiterate;
f96e0b
 
f96e0b
 devmapper_out:
f96e0b
 	  if (! mapper_name && node)
f96e0b
-- 
f96e0b
1.8.2.1
f96e0b