[2531] 2009-08-25 Vladimir Serbinenko <address@hidden>

[Vladimir Serbinenko]

Revision: 2531
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2531
Author:   phcoder
Date:     2009-08-25 08:28:13 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
2009-08-25  Vladimir Serbinenko  <address@hidden>

        Fix breakage in grub-setup.

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

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/i386/pc/grub-setup.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-25 08:11:50 UTC (rev 2530)
+++ trunk/grub2/ChangeLog       2009-08-25 08:28:13 UTC (rev 2531)
@@ -1,5 +1,12 @@
 2009-08-25  Vladimir Serbinenko  <address@hidden>
 
+       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  <address@hidden>
+
        Fix breakage in normal/auth.c.
 
        * normal/auth.c (grub_iswordseparator): New function.

Modified: trunk/grub2/util/i386/pc/grub-setup.c
===================================================================
--- trunk/grub2/util/i386/pc/grub-setup.c       2009-08-25 08:11:50 UTC (rev 
2530)
+++ trunk/grub2/util/i386/pc/grub-setup.c       2009-08-25 08:28:13 UTC (rev 
2531)
@@ -338,12 +338,12 @@
       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!");