* disk/raid.c (insert_array): Don't count named arrays when looking

for unused array numbers.
Reported and tested by: maru.

diff --git a/ChangeLog b/ChangeLog
index c05891b96bd76b9573f7d55eefea76c10e6e7883..e3677b0e2571db2176d1e3b0c75c06a4ae3aac95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-22  Colin Watson  <cjwatson@ubuntu.com>
+
+       * disk/raid.c (insert_array): Don't count named arrays when looking
+       for unused array numbers.
+       Reported and tested by: maru.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
        * bus/usb/emu/usb.c (grub_usb_poll_devices): Add a dummy

diff --git a/disk/raid.c b/disk/raid.c
index 43d2a29ff13eac416157ab1cdf40e72b9f3a1608..7dfd4bd819e4a018d9ca93c2019883deef2d35c7 100644 (file)
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -533,7 +533,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       /* Check whether we don't have multiple arrays with the same number.  */
       for (p = array_list; p != NULL; p = p->next)
         {
-          if (p->number == array->number) 
+          if (! p->name && p->number == array->number) 
            break;
         }
 
@@ -546,7 +546,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
            {
              for (p = array_list; p != NULL; p = p->next)
                {
-                 if (p->number == i)
+                 if (! p->name && p->number == i)
                    break;
                }