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

* util/getroot.c (grub_guess_root_devices): Don't canonicalise

Browse source 
/dev/root and /dev/dm-*.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-02 14:36:27 +02:00
parent 00d41dee71
commit de89d33847
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-02 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_guess_root_devices): Don't canonicalise
/dev/root and /dev/dm-*.
2012-06-02 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/normal/menu_entry.c (update_screen): Fix loop condition to * grub-core/normal/menu_entry.c (update_screen): Fix loop condition to

6
util/getroot.c
View file

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