Fix compilation problem

diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index d07ce92f3146e03acba1a184ca9512094a43282a..09d09d5a951855cbaaa09cc06e9bceac84df301f 100644 (file)
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -678,7 +678,6 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 void
 grub_multiboot_set_bootdev (void)
 {
-  char *p;
   grub_device_t dev;
 
   slice = ~0;
@@ -696,22 +695,13 @@ grub_multiboot_set_bootdev (void)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-      char *p0;
-      p = p0 = dev->disk->partition->partmap->get_name (dev->disk->partition);
-      if (p)
-       {
-         if ((p[0] >= '0') && (p[0] <= '9'))
-           {
-             slice = grub_strtoul (p, &p, 0) - 1;
-
-             if ((p) && (p[0] == ','))
-               p++;
-           }
-
-         if ((p[0] >= 'a') && (p[0] <= 'z'))
-           part = p[0] - 'a';
+      if (dev->disk->partition->parent)
+       {
+         part = dev->disk->partition->number;
+         slice = dev->disk->partition->parent->number;
        }
-      grub_free (p0);
+      else
+       slice = dev->disk->partition->number;
     }
   if (dev)
     grub_device_close (dev);