From c521b62b6c02291ff3a5d043663c6a70df71a4a6 Mon Sep 17 00:00:00 2001 From: fzielcke Date: Tue, 28 Jul 2009 15:58:40 +0000 Subject: [PATCH] 2009-07-28 Felix Zielcke * util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks when embedding. --- ChangeLog | 5 +++++ util/i386/pc/grub-setup.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 433417826..2f83512a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-28 Felix Zielcke + + * util/i386/pc/grub-setup.c (setup): Fix 2 incorrect checks + when embedding. + 2009-07-26 Felix Zielcke * util/grub-mkconfig.in (package_version): New variable. diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c index 852b49894..38547e534 100644 --- a/util/i386/pc/grub-setup.c +++ b/util/i386/pc/grub-setup.c @@ -352,9 +352,9 @@ setup (const char *dir, 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."); - 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."); else grub_util_warn ("Embedding area is too small for core.img.");