From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 20:32:11 +0000 (+0100)
Subject: 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
X-Git-Tag: 1.98~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d07803630846b2afda23b926bb28b0523fed8adc;p=thirdparty%2Fgrub.git

2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>

	* kern/main.c (grub_load_modules): Handle errors from init functions of
	embeded modules.
---

diff --git a/ChangeLog b/ChangeLog
index f72f71783..f3a6a12f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/main.c (grub_load_modules): Handle errors from init functions of
+	embeded modules.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/autofs.c (autoload_fs_module): Handle errors.
diff --git a/kern/main.c b/kern/main.c
index 456105378..e7566fab9 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -68,6 +68,9 @@ grub_load_modules (void)
 			       (header->size - sizeof (struct grub_module_header))))
 	grub_fatal ("%s", grub_errmsg);
 
+      if (grub_errno)
+	grub_print_error ();
+
       return 0;
     }