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

2010-07-01 Robert Millan <rmh@gnu.org>

Browse source 
* kern/emu/hostdisk.c (convert_system_partition_to_system_disk):
	Support 'p' as partition separator on kernel of FreeBSD (used
	with GPT labels).
	(grub_util_biosdisk_get_grub_dev): Likewise.
This commit is contained in:
Robert Millan 2010-07-01 10:52:23 +02:00
parent ec1d04f1de
commit b79889ba76
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-07-01 Robert Millan <rmh@gnu.org>
* kern/emu/hostdisk.c (convert_system_partition_to_system_disk):
Support 'p' as partition separator on kernel of FreeBSD (used
with GPT labels).
(grub_util_biosdisk_get_grub_dev): Likewise.
2010-07-01 Vladimir Serbinenko <phcoder@gmail.com> 2010-07-01 Vladimir Serbinenko <phcoder@gmail.com>
Yeeloong firmware port. Yeeloong firmware port.

6
kern/emu/hostdisk.c
View file

@ -1260,7 +1260,7 @@ devmapper_out:
for (p = path + 5; *p; ++p) for (p = path + 5; *p; ++p)
if (grub_isdigit(*p)) if (grub_isdigit(*p))
{ {
p = strchr (p, 's'); p = strpbrk (p, "sp");
if (p) if (p)
*p = '\0'; *p = '\0';
break; break;
@ -1507,7 +1507,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
} }
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
/* FreeBSD uses "/dev/[a-z]+[0-9]+(s[0-9]+[a-z]?)?". */ /* FreeBSD uses "/dev/[a-z]+[0-9]+([sp][0-9]+[a-z]?)?". */
{ {
int dos_part = -1; int dos_part = -1;
int bsd_part = -1; int bsd_part = -1;
@ -1521,7 +1521,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
for (p = os_dev + 5; *p; ++p) for (p = os_dev + 5; *p; ++p)
if (grub_isdigit(*p)) if (grub_isdigit(*p))
{ {
p = strchr (p, 's'); /* msdos or apple (or ... ?) partition map */ p = strpbrk (p, "sp"); /* msdos or apple (or ... ?) partition map */
if (p) if (p)
{ {
p++; p++;