merge with mainline

This commit is contained in:
BVK Chaitanya 2010-05-04 09:09:03 +05:30
commit 81827e248c
69 changed files with 2217 additions and 592 deletions

View file

@ -246,7 +246,7 @@ main (int argc, char *argv[])
if (strcmp (root_dev, "host") == 0)
dir = xstrdup (dir);
else
dir = grub_get_prefix (dir);
dir = grub_make_system_path_relative_to_its_root (dir);
prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
sprintf (prefix, "(%s)%s", root_dev, dir);
free (dir);