From: proski Date: Sun, 6 Apr 2008 17:16:39 +0000 (+0000) Subject: 2008-04-06 Pavel Roskin X-Git-Tag: 1.98~1565 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87a297bf55ec8743578466dee5f8efbfea69bd87;p=thirdparty%2Fgrub.git 2008-04-06 Pavel Roskin * 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 --- diff --git a/ChangeLog b/ChangeLog index eb8bd7a44..34393de1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-06 Pavel Roskin + + * 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 + 2008-04-05 Pavel Roskin * bus/pci.c (grub_pci_iterate): For multifunction devices, probe diff --git a/util/grub-emu.c b/util/grub-emu.c index 3b562f760..00a2c49c9 100644 --- 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 39f409664..241f23dd8 100644 --- 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; }