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 f72f71783d875aae2bc84f603f0f48e826f029cf..f3a6a12f537a4422725a573e5f34b4e4ea4b52d0 100644 (file)
--- 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 45610537897f7cbd70116c8b88a4b73f2bd0f15d..e7566fab9e68d8e658199344dd65e6b942f0a572 100644 (file)
--- 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;
     }