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

* util/grub-probe.c (probe): Don't crash on canonicalize_file_name

Browse source 
failure.
	Put back lost PRINT_DRIVE.
This commit is contained in:
Richard Laager 2012-02-03 11:02:06 +01:00 • committed by Vladimir 'phcoder' Serbinenko
parent e9084abefd
commit 65f08dbfe0
3 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
util/getroot.c
View file

@ -846,10 +846,7 @@ grub_guess_root_devices (const char *dir)
int root, dm;
*cur = canonicalize_file_name (tmp);
if (*cur == NULL)
{
grub_util_error (_("failed to get canonical path of %s"), tmp);
break;
}
grub_util_error (_("failed to get canonical path of %s"), tmp);
free (tmp);
root = (strcmp (*cur, "/dev/root") == 0);
dm = (strncmp (*cur, "/dev/dm-", sizeof ("/dev/dm-") - 1) == 0);