vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* 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>
This commit is contained in:
proski 2008-04-06 17:16:39 +00:00
parent f6ce7629ad
commit 87a297bf55
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2008-04-05 Pavel Roskin <proski@gnu.org>
* bus/pci.c (grub_pci_iterate): For multifunction devices, probe * bus/pci.c (grub_pci_iterate): For multifunction devices, probe

4
util/grub-emu.c
View file

@ -186,8 +186,6 @@ main (int argc, char *argv[])
/* XXX: This is a bit unportable. */ /* XXX: This is a bit unportable. */
grub_util_biosdisk_init (dev_map); grub_util_biosdisk_init (dev_map);
grub_hostfs_init ();
grub_init_all (); grub_init_all ();
/* Make sure that there is a root device. */ /* Make sure that there is a root device. */
@ -217,8 +215,6 @@ main (int argc, char *argv[])
grub_fini_all (); grub_fini_all ();
grub_hostfs_fini ();
grub_machine_fini (); grub_machine_fini ();
return 0; return 0;

4
util/grub-fstest.c
View file

@ -499,8 +499,6 @@ main (int argc, char *argv[])
usage (1); usage (1);
} }
grub_hostfs_init ();
/* Initialize all modules. */ /* Initialize all modules. */
grub_init_all (); grub_init_all ();
@ -516,7 +514,5 @@ main (int argc, char *argv[])
/* Free resources. */ /* Free resources. */
grub_fini_all (); grub_fini_all ();
grub_hostfs_fini ();
return 0; return 0;
} }