vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
robertmh 2008-01-08 11:38:18 +00:00
parent 7076340d08
commit 5aa541e6eb
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2008-01-08 Robert Millan <rmh@aybabtu.com>
* Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and * Makefile.in (uninstall): Handle `$(update-grub_SCRIPTS)' and

8
loader/i386/pc/linux.c
View file

@ -146,10 +146,12 @@ grub_rescue_cmd_linux (int argc, char *argv[])
grub_linux_tmp_addr = (char *) GRUB_LINUX_BZIMAGE_ADDR + prot_size; grub_linux_tmp_addr = (char *) GRUB_LINUX_BZIMAGE_ADDR + prot_size;
if (! grub_linux_is_bzimage if (! grub_linux_is_bzimage
&& prot_size > (grub_size_t) (grub_linux_real_addr && ((char *) GRUB_LINUX_ZIMAGE_ADDR + prot_size
- (char *) GRUB_LINUX_ZIMAGE_ADDR)) > (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; goto fail;
} }