vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compilation problem

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-27 22:40:49 +01:00
parent df32be8cc1
commit 3a7c36977a
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
loader/i386/multiboot_mbi2.c
View file

@ -678,7 +678,6 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
void void
grub_multiboot_set_bootdev (void) grub_multiboot_set_bootdev (void)
{ {
char *p;
grub_device_t dev; grub_device_t dev;
slice = ~0; slice = ~0;
@ -696,22 +695,13 @@ grub_multiboot_set_bootdev (void)
dev = grub_device_open (0); dev = grub_device_open (0);
if (dev && dev->disk && dev->disk->partition) if (dev && dev->disk && dev->disk->partition)
{ {
char *p0; if (dev->disk->partition->parent)
p = p0 = dev->disk->partition->partmap->get_name (dev->disk->partition);
if (p)
{ {
if ((p[0] >= '0') && (p[0] <= '9')) part = dev->disk->partition->number;
{ slice = dev->disk->partition->parent->number;
slice = grub_strtoul (p, &p, 0) - 1;
if ((p) && (p[0] == ','))
p++;
} }
else
if ((p[0] >= 'a') && (p[0] <= 'z')) slice = dev->disk->partition->number;
part = p[0] - 'a';
}
grub_free (p0);
} }
if (dev) if (dev)
grub_device_close (dev); grub_device_close (dev);