2006-06-05 Yoshinori K. Okuji <okuji@enbug.org>

        * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The conditional
        of checking LINUX_MEM_SIZE was reverse. Reported by Jesus
        Velazquez <jesus.velazquez@gmail.com>.

diff --git a/ChangeLog b/ChangeLog
index 763ccf2c4bc04e919bc4e424c0752c3a94f91616..f190019e970261d3ee0b2897698dc76f3464c513 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-05  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The conditional
+       of checking LINUX_MEM_SIZE was reverse. Reported by Jesus
+       Velazquez <jesus.velazquez@gmail.com>.
+
 2006-06-05  Yoshinori K. Okuji  <okuji@enbug.org>
 
        Count partitions from 1 instead of 0 in the string representation

diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 73a9662c97d23c4603283e80f5148c0fe891f0ce..c4049d40bd38b3c277e2bdda5e61185d00deefd3 100644 (file)
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -326,7 +326,7 @@ grub_rescue_cmd_initrd (int argc, char *argv[])
   else
     addr_max = GRUB_LINUX_INITRD_MAX_ADDRESS;
 
-  if (!linux_mem_size && linux_mem_size < addr_max)
+  if (linux_mem_size != 0 && linux_mem_size < addr_max)
     addr_max = linux_mem_size;
 
   /* Linux 2.3.xx has a bug in the memory range check, so avoid