From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Apr 2010 16:58:56 +0000 (+0200)
Subject: 	* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.
X-Git-Tag: 1.99~945
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0973daeb380d6d1ef26a10feb28be4ef5140c861;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index a89f7e6cc..87c72cd43 100644
--- 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 2c54ca3b3..c2ae82df2 100644
--- 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;