2009-07-28 Felix Zielcke <fzielcke@z-51.de>

* util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks
	when embedding.
This commit is contained in:
fzielcke 2009-07-28 15:58:40 +00:00
parent 880e0a0c70
commit c521b62b6c
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2009-07-28 Felix Zielcke <fzielcke@z-51.de>
* util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks
when embedding.
2009-07-26 Felix Zielcke <fzielcke@z-51.de> 2009-07-26 Felix Zielcke <fzielcke@z-51.de>
* util/grub-mkconfig.in (package_version): New variable. * util/grub-mkconfig.in (package_version): New variable.

View file

@ -352,9 +352,9 @@ setup (const char *dir,
if ((unsigned long) core_sectors > embed_region.end - embed_region.start) if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
{ {
if (core_sectors > 62 * 512) if (core_sectors > 62)
grub_util_warn ("Your core.img is unusually large. It won't fit in the embedding area."); grub_util_warn ("Your core.img is unusually large. It won't fit in the embedding area.");
else if (embed_region.end - embed_region.start < 62 * 512) else if (embed_region.end - embed_region.start < 62)
grub_util_warn ("Your embedding area is unusually small. core.img won't fit in it."); grub_util_warn ("Your embedding area is unusually small. core.img won't fit in it.");
else else
grub_util_warn ("Embedding area is too small for core.img."); grub_util_warn ("Embedding area is too small for core.img.");