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

Fix IEEE1275 bugs in grub-probe

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-24 02:54:28 +01:00
parent 2b5c1a0810
commit 93d0a00116
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
util/grub-probe.c
View file

@ -156,6 +156,7 @@ escape_of_path (const char *orig_path)
*d++ = '\\'; *d++ = '\\';
*d++ = c; *d++ = c;
} }
*d = 0;
free ((char *) orig_path); free ((char *) orig_path);
@ -350,16 +351,17 @@ probe (const char *path, char *device_name)
if (print == PRINT_HINT_STR) if (print == PRINT_HINT_STR)
{ {
const char *orig_path = grub_util_devname_to_ofpath (device_name); const char *osdev = grub_util_biosdisk_get_osdev (dev->disk);
const char *orig_path = grub_util_devname_to_ofpath (osdev);
char *biosname, *bare, *efi; char *biosname, *bare, *efi;
const char *map; const char *map;
if (orig_path) if (orig_path)
{ {
char *ofpath = escape_of_path (orig_path); char *ofpath = escape_of_path (orig_path);
printf ("--hint-ieee1275="); printf ("--hint-ieee1275='");
print_full_name (ofpath, dev); print_full_name (ofpath, dev);
printf (" "); printf ("' ");
free (ofpath); free (ofpath);
} }
@ -395,9 +397,9 @@ probe (const char *path, char *device_name)
map = grub_util_biosdisk_get_compatibility_hint (dev->disk); map = grub_util_biosdisk_get_compatibility_hint (dev->disk);
if (map) if (map)
{ {
printf ("--hint="); printf ("--hint='");
print_full_name (map, dev); print_full_name (map, dev);
printf (" "); printf ("' ");
} }
printf ("\n"); printf ("\n");
@ -435,7 +437,8 @@ probe (const char *path, char *device_name)
} }
if (print == PRINT_IEEE1275_HINT) if (print == PRINT_IEEE1275_HINT)
{ {
const char *orig_path = grub_util_devname_to_ofpath (device_name); const char *osdev = grub_util_biosdisk_get_osdev (dev->disk);
const char *orig_path = grub_util_devname_to_ofpath (osdev);
char *ofpath = escape_of_path (orig_path); char *ofpath = escape_of_path (orig_path);
const char *map; const char *map;