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

Save & restore grub_fs_autoload_hook while we're in read_fs_list()

Browse source
This commit is contained in:
Robert Millan 2009-11-09 21:33:15 +00:00
parent e880248e79
commit 47972a2420
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
normal/autofs.c
View file

@ -61,8 +61,15 @@ read_fs_list (void)
if (filename) if (filename)
{ {
grub_file_t file; grub_file_t file;
grub_fs_autoload_hook_t tmp_autoload_hook;
grub_sprintf (filename, "%s/fs.lst", prefix); grub_sprintf (filename, "%s/fs.lst", prefix);
/* This rules out the possibility that read_fs_list() is invoked
recursively when we call grub_file_open() below. */
tmp_autoload_hook = grub_fs_autoload_hook;
grub_fs_autoload_hook = NULL;
file = grub_file_open (filename); file = grub_file_open (filename);
if (file) if (file)
{ {
@ -116,6 +123,7 @@ read_fs_list (void)
} }
grub_file_close (file); grub_file_close (file);
grub_fs_autoload_hook = tmp_autoload_hook;
} }
grub_free (filename); grub_free (filename);