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

diff --git a/ChangeLog b/ChangeLog
index a89f7e6cc1eca3a213d6d81e652ef1d4ad3ba0de..87c72cd4312c1fbe419af98f5383f1838d3d7fb6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * Makefile.in: Add missing localedir setting.

diff --git a/disk/lvm.c b/disk/lvm.c
index 2c54ca3b3fce1f4febb4c8e69a11f0403edb55cc..c2ae82df25b1c24792cd82ed7371f0aa998cc325 100644 (file)
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -24,6 +24,10 @@
 #include <grub/misc.h>
 #include <grub/lvm.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 static struct grub_lvm_vg *vg_list;
 static int lv_count;
 
@@ -68,6 +72,9 @@ grub_lvm_memberlist (grub_disk_t disk)
   if (lv->vg->pvs)
     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->disk = pv->disk;
        tmp->next = list;