From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 14:10:36 +0000 (+0100)
Subject: * util/deviceiter.c (grub_util_iterate_devices): Skip MD devices,
X-Git-Tag: 1.99~745
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5357687a559895b5eec6c24756451e5d4d92145a;p=thirdparty%2Fgrub.git

* util/deviceiter.c (grub_util_iterate_devices): Skip MD devices,
which we expect to be handled by upper layers.
---

diff --git a/ChangeLog b/ChangeLog
index 4219dab75..a37ac98f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/deviceiter.c (grub_util_iterate_devices): Skip MD devices,
+	which we expect to be handled by upper layers.
+
 2010-07-06  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* bus/usb/usbhub.c: #include time.h header.
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 64d1cae87..bbcc00a91 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -523,6 +523,9 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	       later.  */
 	    if (strncmp (entry->d_name, "dm-", sizeof ("dm-") - 1) == 0)
 	      continue;
+	    /* Skip RAID entries; they are handled by upper layers.  */
+	    if (strncmp (entry->d_name, "md-", sizeof ("md-") - 1) == 0)
+	      continue;
 	    if (names_len >= names_max)
 	      {
 		names_max *= 2;