2008-01-08 Robert Millan <rmh@aybabtu.com>

        * loader/i386/pc/linux.c (grub_rescue_cmd_linux): For
        `! grub_linux_is_bzimage', change order of address comparison to make
        it more intuitive, and improve "too big zImage" error message.

diff --git a/ChangeLog b/ChangeLog
index 0f9fe83ba7ed0149a1c73fa9fd7454dc1d713c85..f7dc6f2d1b9e11fd93d5287e978848ead9a3d73a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-08  Robert Millan  <rmh@aybabtu.com>
+
+       * loader/i386/pc/linux.c (grub_rescue_cmd_linux): For
+       `! grub_linux_is_bzimage', change order of address comparison to make
+       it more intuitive, and improve "too big zImage" error message.
+
 2008-01-08  Robert Millan  <rmh@aybabtu.com>
 
        * Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index d66fd205196c153bb69a0d73b46e79bc40a3a1af..0b0c26ccffed00030443c443e18ff84ad965450d 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -146,10 +146,12 @@ grub_rescue_cmd_linux (int argc, char *argv[])
   grub_linux_tmp_addr = (char *) GRUB_LINUX_BZIMAGE_ADDR + prot_size;
 
   if (! grub_linux_is_bzimage
-      && prot_size > (grub_size_t) (grub_linux_real_addr
-                                   - (char *) GRUB_LINUX_ZIMAGE_ADDR))
+      && ((char *) GRUB_LINUX_ZIMAGE_ADDR + prot_size
+         > (grub_size_t) grub_linux_real_addr))
     {
-      grub_error (GRUB_ERR_BAD_OS, "too big zImage, use bzImage instead");
+      grub_error (GRUB_ERR_BAD_OS, "too big zImage (0x%x > 0x%x), use bzImage instead",
+                 (char *) GRUB_LINUX_ZIMAGE_ADDR + prot_size,
+                 (grub_size_t) grub_linux_real_addr);
       goto fail;
     }