From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 28 Mar 2012 15:56:45 +0000 (+0200)
Subject: 	* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Degrade
X-Git-Tag: 2.00~355
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d1182a66b3830538f4d47ce4a5bace0deb954ba;p=thirdparty%2Fgrub.git

	* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Degrade
	the error when some elements are missing into a warning.
---

diff --git a/ChangeLog b/ChangeLog
index 530b22266..cfc84c365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Degrade
+	the error when some elements are missing into a warning.
+
 2012-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/charset.c (bidi_line_wrap): Fix out-of-range swap.
diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index 440194ab6..0a343db6b 100644
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -296,8 +296,12 @@ grub_diskfilter_memberlist (grub_disk_t disk)
   for (pv = lv->vg->pvs; pv; pv = pv->next)
     {
       if (!pv->disk)
-	grub_util_error (_("Couldn't find physical volume `%s'."
-			   " Check your device.map"), pv->name);
+	{
+	  grub_util_warn (_("Couldn't find physical volume `%s'."
+			    " Some modules may be missing from core image."),
+			  pv->name);
+	  continue;
+	}
       tmp = grub_malloc (sizeof (*tmp));
       tmp->disk = pv->disk;
       tmp->next = list;