2009-08-25 Vladimir Serbinenko <phcoder@gmail.com>

	Fix breakage in grub-setup.

	* util/i386/pc/grub-setup.c (setup): Use "part_msdos" instead of
	"msdos_partition_map".

diff --git a/ChangeLog b/ChangeLog
index 4f8c068dd82c32fb4e12e1698abdf11572a664f2..d30cfd1378290829be9315da76a441c57375b3b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       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  <phcoder@gmail.com>
 
        Fix breakage in normal/auth.c.

diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 7f38c42931b66b153997c41abd19c2aa64585d5c..ccfbd1d25c378df180635adf652182b2a47a0591 100644 (file)
--- 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!");