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

merge mainline

Browse source
This commit is contained in:
Colin Watson 2010-07-17 11:17:49 +01:00
commit 41f435b1b4
657 changed files with 94764 additions and 29525 deletions
Download patch file Download diff file Expand all files Collapse all files

14
disk/raid.c
View file

@ -561,19 +561,9 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
/* mdraid 1.x superblocks have only a name stored not a number.
Use it directly as GRUB device. */
if (! array->name)
{
array->name = grub_malloc (13);
if (! array->name)
{
grub_free (array->uuid);
grub_free (array);
return grub_errno;
}
grub_sprintf (array->name, "md%d", array->number);
}
array->name = grub_xasprintf ("md%d", array->number);
else
grub_sprintf (array->name, "%s", array->name);
array->name = grub_xasprintf ("%s", array->name);
grub_dprintf ("raid", "Found array %s (%s)\n", array->name,
scanner_name);