* 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 4219dab757ac79bbbb5620545f2a8f0576f02fc1..a37ac98f1e20af6e1e584c291f039abd61af5143 100644 (file)
--- 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 64d1cae877447016a3c1386a3026ddc91ff37e5f..bbcc00a914dbcad458aded86401f40695271253b 100644 (file)
--- 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;