module support in grub-emu

util/grub-emu.c

@@ -38,8 +38,6 @@
 #include <grub/partition.h>
 #include <grub/i18n.h>
 
-#include <grub_emu_init.h>
-
 #define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
@@ -55,6 +53,7 @@ grub_arch_modules_addr (void)
   return 0;
 }
 
+#if GRUB_NO_MODULES
 grub_err_t
 grub_arch_dl_check_header (void *ehdr)
 {
@@ -71,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
   return GRUB_ERR_BAD_MODULE;
 }
+#endif
 
 void
 grub_reboot (void)
@@ -148,6 +148,8 @@ usage (int status)
 
 void grub_hostfs_init (void);
 void grub_hostfs_fini (void);
+void grub_host_init (void);
+void grub_host_fini (void);
 
 int
 main (int argc, char *argv[])
@@ -207,6 +209,7 @@ main (int argc, char *argv[])
 
   signal (SIGINT, SIG_IGN);
   grub_console_init ();
+  grub_host_init ();
   grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
@@ -232,7 +235,10 @@ main (int argc, char *argv[])
 	}
     }
 
-  dir = grub_get_prefix (dir);
+  if (strcmp (root_dev, "host") == 0)
+    dir = xstrdup (dir);
+  else
+    dir = grub_get_prefix (dir);
   prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
   sprintf (prefix, "(%s)%s", root_dev, dir);
   free (dir);
@@ -245,6 +251,7 @@ main (int argc, char *argv[])
   grub_fini_all ();
 #endif
   grub_hostfs_fini ();
+  grub_host_fini ();
 
   grub_machine_fini ();