grub2 ChangeLog loader/i386/pc/linux.c

[Yoshinori K. Okuji]

CVSROOT:        /cvsroot/grub
Module name:    grub2
Changes by:     Yoshinori K. Okuji <okuji>      06/06/05 19:59:33

Modified files:
        .              : ChangeLog 
        loader/i386/pc : linux.c 

Log message:
        2006-06-05  Yoshinori K. Okuji  <address@hidden>
        
                * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The 
conditional
                of checking LINUX_MEM_SIZE was reverse. Reported by Jesus
                Velazquez <address@hidden>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/grub2/ChangeLog?cvsroot=grub&r1=1.280&r2=1.281
http://cvs.savannah.gnu.org/viewcvs/grub2/loader/i386/pc/linux.c?cvsroot=grub&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/grub/grub2/ChangeLog,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -b -r1.280 -r1.281
--- ChangeLog   5 Jun 2006 17:18:31 -0000       1.280
+++ ChangeLog   5 Jun 2006 19:59:33 -0000       1.281
@@ -1,5 +1,11 @@
 2006-06-05  Yoshinori K. Okuji  <address@hidden>
 
+       * loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The conditional
+       of checking LINUX_MEM_SIZE was reverse. Reported by Jesus
+       Velazquez <address@hidden>.
+
+2006-06-05  Yoshinori K. Okuji  <address@hidden>
+
        Count partitions from 1 instead of 0 in the string representation
        of partitions. Still use 0-based internally.
        

Index: loader/i386/pc/linux.c
===================================================================
RCS file: /cvsroot/grub/grub2/loader/i386/pc/linux.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- loader/i386/pc/linux.c      14 May 2006 21:16:20 -0000      1.12
+++ loader/i386/pc/linux.c      5 Jun 2006 19:59:33 -0000       1.13
@@ -326,7 +326,7 @@
   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