[PATCH] tell the user why they are in rescue mode

[Sam Morris <sam@robots.org.uk>]

[-- Attachment #1.1: Type: text/plain, Size: 315 bytes --]

Here's a patch that explains to the user why they are being sent to
rescue mode in cast normal mode fails.

I've also corrected a grammatical error in the 'entering rescue mode'
message.

-- 
Sam Morris
http://robots.org.uk/

PGP key id 1024D/5EA01078
3412 EA18 1277 354B 991B  C869 B219 7FDB 5EA0 1078

[-- Attachment #1.2: verbose_error.patch --]
[-- Type: text/x-patch, Size: 1284 bytes --]

diff -ru grub2-1.96+20080203+orig/kern/main.c grub2-1.96+20080203+sam/kern/main.c
--- grub2-1.96+20080203+orig/kern/main.c	2008-01-05 12:04:35.000000000 +0000
+++ grub2-1.96+20080203+sam/kern/main.c	2008-02-07 08:41:01.000000000 +0000
@@ -102,8 +102,13 @@
   /* Load the module.  */
   grub_dl_load ("normal");
   
-  /* Ignore any error, because we have the rescue mode anyway.  */
-  grub_errno = GRUB_ERR_NONE;
+  if (grub_errno != GRUB_ERR_NONE)
+    {
+      grub_printf ("Unable to enter 'normal' mode (error %d: %s)\n", grub_errno, grub_errmsg);
+
+      /* We're about to continue into rescue mode, so clear the error. */
+      grub_errno = GRUB_ERR_NONE;
+    }
 }
 
 /* The main routine.  */
diff -ru grub2-1.96+20080203+orig/kern/rescue.c grub2-1.96+20080203+sam/kern/rescue.c
--- grub2-1.96+20080203+orig/kern/rescue.c	2008-01-30 14:42:09.000000000 +0000
+++ grub2-1.96+20080203+sam/kern/rescue.c	2008-02-07 08:38:46.000000000 +0000
@@ -618,7 +618,7 @@
   /* First of all, attempt to execute the normal mode.  */
   attempt_normal_mode ();
 
-  grub_printf ("Entering into rescue mode...\n");
+  grub_printf ("Entering rescue mode...\n");
   
   grub_rescue_register_command ("boot", grub_rescue_cmd_boot,
 				"boot an operating system");

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]