From aea664ea288daf09569c9eed2ac7932fd7b1f1af Mon Sep 17 00:00:00 2001 From: phcoder Date: Tue, 25 Aug 2009 08:28:13 +0000 Subject: [PATCH] 2009-08-25 Vladimir Serbinenko Fix breakage in grub-setup. * util/i386/pc/grub-setup.c (setup): Use "part_msdos" instead of "msdos_partition_map". --- ChangeLog | 7 +++++++ util/i386/pc/grub-setup.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f8c068dd..d30cfd137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-08-25 Vladimir Serbinenko + + Fix breakage in grub-setup. + + * util/i386/pc/grub-setup.c (setup): Use "part_msdos" instead of + "msdos_partition_map". + 2009-08-25 Vladimir Serbinenko Fix breakage in normal/auth.c. diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c index 7f38c4293..ccfbd1d25 100644 --- a/util/i386/pc/grub-setup.c +++ b/util/i386/pc/grub-setup.c @@ -338,12 +338,12 @@ setup (const char *dir, goto unable_to_embed; } - grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "msdos_partition_map") ? + grub_partition_iterate (dest_dev->disk, (strcmp (dest_partmap, "part_msdos") ? find_usable_region_gpt : find_usable_region_msdos)); if (embed_region.end == embed_region.start) { - if (! strcmp (dest_partmap, "msdos_partition_map")) + if (! strcmp (dest_partmap, "part_msdos")) grub_util_warn ("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"); else grub_util_warn ("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!");