From 5357687a559895b5eec6c24756451e5d4d92145a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 6 Jul 2010 15:10:36 +0100 Subject: [PATCH] * util/deviceiter.c (grub_util_iterate_devices): Skip MD devices, which we expect to be handled by upper layers. --- ChangeLog | 5 +++++ util/deviceiter.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4219dab75..a37ac98f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-06 Colin Watson + + * util/deviceiter.c (grub_util_iterate_devices): Skip MD devices, + which we expect to be handled by upper layers. + 2010-07-06 BVK Chaitanya * 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;