Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-24 08:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge mainline into newreloc

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-04-01 22:17:26 +02:00
2 parents d1de6ed1dc 495442ed02
commit 8b0800f66f
239 files changed
+15971 -6550
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

loader/i386/bsd.c
+5 -14
View File
@@ -176,7 +176,6 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
grub_uint32_t * unit,
grub_uint32_t * slice, grub_uint32_t * part)
{
char *p;
grub_device_t dev;
#ifdef GRUB_MACHINE_PCBIOS
@@ -190,21 +189,13 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
dev = grub_device_open (0);
if (dev && dev->disk && dev->disk->partition)
{
p = dev->disk->partition->partmap->get_name (dev->disk->partition);
if (p)
if (dev->disk->partition->parent)
{
if ((p[0] >= '0') && (p[0] <= '9'))
{
*slice = grub_strtoul (p, &p, 0);
if ((p) && (p[0] == ','))
p++;
}
if ((p[0] >= 'a') && (p[0] <= 'z'))
*part = p[0] - 'a';
*part = dev->disk->partition->number;
*slice = dev->disk->partition->parent->number + 1;
}
else
*slice = dev->disk->partition->number + 1;
}
if (dev)
grub_device_close (dev);