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

* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-17 18:58:56 +02:00
parent ebfe7eb4dd
commit 0973daeb38
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-04-17 Vladimir Serbinenko <phcoder@gmail.com>
* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.
2010-04-17 Christian Franke <franke@computer.org> 2010-04-17 Christian Franke <franke@computer.org>
* Makefile.in: Add missing localedir setting. * Makefile.in: Add missing localedir setting.

7
disk/lvm.c
View file

@ -24,6 +24,10 @@
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/lvm.h> #include <grub/lvm.h>
#ifdef GRUB_UTIL
#include <grub/util/misc.h>
#endif
static struct grub_lvm_vg *vg_list; static struct grub_lvm_vg *vg_list;
static int lv_count; static int lv_count;
@ -68,6 +72,9 @@ grub_lvm_memberlist (grub_disk_t disk)
if (lv->vg->pvs) if (lv->vg->pvs)
for (pv = lv->vg->pvs; pv; pv = pv->next) for (pv = lv->vg->pvs; pv; pv = pv->next)
{ {
if (!pv->disk)
grub_util_error ("Couldn't find PV %s. Check your device.map",
pv->name);
tmp = grub_malloc (sizeof (*tmp)); tmp = grub_malloc (sizeof (*tmp));
tmp->disk = pv->disk; tmp->disk = pv->disk;
tmp->next = list; tmp->next = list;