2008-04-06 Pavel Roskin <proski@gnu.org>

	* util/grub-emu.c (main): Remove calls to grub_hostfs_init() and
	grub_hostfs_fini(), as they are called from grub_init_all() and
	grub_fini_all() respectively.  This fixes an infinite loop in
	grub-fstest due to double registration of hostfs.
	Reported by Christian Franke <Christian.Franke@t-online.de>

diff --git a/ChangeLog b/ChangeLog
index eb8bd7a4499491ddaa16bfe149fbdcd82d0e6e72..34393de1f92e65ac35703307227b5ed5ed36a237 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-06  Pavel Roskin  <proski@gnu.org>
+
+       * util/grub-emu.c (main): Remove calls to grub_hostfs_init() and
+       grub_hostfs_fini(), as they are called from grub_init_all() and
+       grub_fini_all() respectively.  This fixes an infinite loop in
+       grub-fstest due to double registration of hostfs.
+       Reported by Christian Franke <Christian.Franke@t-online.de>
+
 2008-04-05  Pavel Roskin  <proski@gnu.org>
 
        * bus/pci.c (grub_pci_iterate): For multifunction devices, probe

diff --git a/util/grub-emu.c b/util/grub-emu.c
index 3b562f76051c8cdf5f9cc25c16c04b5719459397..00a2c49c978052a1d84a18123c243fbf82af8c8e 100644 (file)
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -186,8 +186,6 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-  grub_hostfs_init ();
-
   grub_init_all ();
 
   /* Make sure that there is a root device.  */
@@ -217,8 +215,6 @@ main (int argc, char *argv[])
 
   grub_fini_all ();
 
-  grub_hostfs_fini ();
-
   grub_machine_fini ();
   
   return 0;

diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 39f4096643ecd00ed625c406948b9fed962a1ad0..241f23dd830b250a084e2ed5d2ceba19333a05f6 100644 (file)
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -499,8 +499,6 @@ main (int argc, char *argv[])
       usage (1);
     }
 
-  grub_hostfs_init ();
-
   /* Initialize all modules. */
   grub_init_all ();
 
@@ -516,7 +514,5 @@ main (int argc, char *argv[])
   /* Free resources.  */
   grub_fini_all ();
 
-  grub_hostfs_fini ();
-
   return 0;
 }