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

* grub-core/disk/diskfilter.c (insert_array): Fix order to discover

Browse source 
ambigouos RAID before discovering RAIDs on top of it.
	Reported by: bodom.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-06-07 15:41:10 +02:00
parent ccfc0bdb53
commit 96dbe64813
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-06-07 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (insert_array): Fix order to discover
ambigouos RAID before discovering RAIDs on top of it.
Reported by: bodom.
2013-06-07 Vladimir Serbinenko <phcoder@gmail.com> 2013-06-07 Vladimir Serbinenko <phcoder@gmail.com>
Fix typo (failback vs fallback). Fix typo (failback vs fallback).

17
grub-core/disk/diskfilter.c
View file

@ -1045,10 +1045,14 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
{ {
struct grub_diskfilter_pv *pv; struct grub_diskfilter_pv *pv;
grub_dprintf ("diskfilter", "Inserting %s into %s (%s)\n", disk->name, grub_dprintf ("diskfilter", "Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
(unsigned long long) grub_partition_get_start (disk->partition),
(unsigned long long) grub_disk_get_size (disk),
array->name, diskfilter->name); array->name, diskfilter->name);
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
grub_util_info ("Inserting %s into %s (%s)\n", disk->name, grub_util_info ("Inserting %s (+%lld,%lld) into %s (%s)\n", disk->name,
(unsigned long long) grub_partition_get_start (disk->partition),
(unsigned long long) grub_disk_get_size (disk),
array->name, diskfilter->name); array->name, diskfilter->name);
array->driver = diskfilter; array->driver = diskfilter;
#endif #endif
@ -1092,14 +1096,7 @@ insert_array (grub_disk_t disk, const struct grub_diskfilter_pv_id *id,
/* Add the device to the array. */ /* Add the device to the array. */
for (lv = array->lvs; lv; lv = lv->next) for (lv = array->lvs; lv; lv = lv->next)
if (!lv->became_readable_at && lv->fullname && is_lv_readable (lv, 0)) if (!lv->became_readable_at && lv->fullname && is_lv_readable (lv, 0))
{ lv->became_readable_at = ++inscnt;
lv->became_readable_at = ++inscnt;
if (is_lv_readable (lv, 1))
{
scan_disk (lv->fullname, 1);
lv->scanned = 1;
}
}
break; break;
} }