merge with mainline

include/grub/emu/getroot.h

@@ -26,7 +26,6 @@ enum grub_dev_abstraction_types {
 };
 
 char *grub_guess_root_device (const char *dir);
-char *grub_get_prefix (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
 const char *grub_util_check_block_device (const char *blk_dev);

include/grub/emu/misc.h

@@ -19,6 +19,8 @@ extern const char *program_name;
 void grub_init_all (void);
 void grub_fini_all (void);
 
+char *grub_make_system_path_relative_to_its_root (const char *path);
+
 void * EXPORT_FUNC(xmalloc) (grub_size_t size);
 void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size);
 char * EXPORT_FUNC(xstrdup) (const char *str);