vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-04-01 Robert Millan <rmh@aybabtu.com>

Browse source 
Reapply fix from 2008-07-28 which was accidentally reverted; also
        perform the same fix to a similar check in same function.

        * disk/raid.c (grub_raid_scan_device): Do not abort when two disks
        with the same number are found, just use issue a warning with
        grub_dprintf(), as this error has been reported to be non-fatal.
This commit is contained in:
robertmh 2009-04-01 01:26:58 +00:00
parent 0d818b7e5c
commit 9c3dd8544c
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
disk/raid.c
View file

@ -495,18 +495,15 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
if (array->total_devs == array->nr_devs)
/* We found more members of the array than the array
actually has according to its superblock. This shouldn't
happen normally, but what is the sanest things to do in such
a case? */
return grub_error (GRUB_ERR_BAD_NUMBER,
"array->nr_devs > array->total_devs (%d)?!?",
array->total_devs);
happen normally. */
grub_dprintf ("raid", "array->nr_devs > array->total_devs (%d)?!?",
array->total_devs);
if (array->device[new_array->index] != NULL)
/* We found multiple devices with the same number. Again,
this shouldn't happen.*/
return grub_error (GRUB_ERR_BAD_NUMBER,
"Found two disks with the number %d?!?",
new_array->number);
grub_dprintf ("raid", "Found two disks with the number %d?!?",
new_array->number);
if (new_array->disk_size < array->disk_size)
array->disk_size = new_array->disk_size;