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

* util/getroot.c (convert_system_partition_to_system_disk) [__APPLE__]: 

Set is_part appropriately.
	(grub_util_biosdisk_get_grub_dev): Use is_part rather than comparing
	names. Canonicalize partition without full disk.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-14 19:16:30 +02:00
parent 4abde34671
commit 29a049c98a
2 changed files with 20 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 @@
2012-06-14 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (convert_system_partition_to_system_disk) [__APPLE__]:
Set is_part appropriately.
(grub_util_biosdisk_get_grub_dev): Use is_part rather than comparing
names. Canonicalize partition without full disk.
2012-06-13 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-13 Vladimir Serbinenko <phcoder@gmail.com>
Revert usb-quiesce since it's wrong. Revert usb-quiesce since it's wrong.

16
util/getroot.c
View File

@ -2074,7 +2074,11 @@ devmapper_out:
ptr = ret + sizeof ("/dev/disk") + rdisk - 1; ptr = ret + sizeof ("/dev/disk") + rdisk - 1;
while (*ptr >= '0' && *ptr <= '9') while (*ptr >= '0' && *ptr <= '9')
ptr++; ptr++;
*ptr = 0; if (*ptr)
{
*is_part = 1;
*ptr = 0;
}
return ret; return ret;
#else #else
# warning "The function `convert_system_partition_to_system_disk' might not work on your OS correctly." # warning "The function `convert_system_partition_to_system_disk' might not work on your OS correctly."
@ -2175,8 +2179,10 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
drive = find_system_device (os_dev, &st, 1, 1); drive = find_system_device (os_dev, &st, 1, 1);
sys_disk = convert_system_partition_to_system_disk (os_dev, &st, &is_part); sys_disk = convert_system_partition_to_system_disk (os_dev, &st, &is_part);
if (!sys_disk)
return 0;
grub_util_info ("%s is a parent of %s", sys_disk, os_dev); grub_util_info ("%s is a parent of %s", sys_disk, os_dev);
if (grub_strcmp (os_dev, sys_disk) == 0) if (!is_part)
{ {
free (sys_disk); free (sys_disk);
return make_device_name (drive, -1, -1); return make_device_name (drive, -1, -1);
@ -2264,11 +2270,15 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
but are really more like disks. */ but are really more like disks. */
if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE) if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
{ {
char *canon;
grub_util_warn grub_util_warn
(_("disk does not exist, so falling back to partition device %s"), (_("disk does not exist, so falling back to partition device %s"),
os_dev); os_dev);
drive = find_system_device (os_dev, &st, 0, 1); canon = canonicalize_file_name (os_dev);
drive = find_system_device (canon ? : os_dev, &st, 0, 1);
if (canon)
free (canon);
return make_device_name (drive, -1, -1); return make_device_name (drive, -1, -1);
} }
else else