* grub-core/normal/autofs.c (autoload_fs_module): Save and restore
filter state.
This commit is contained in:
parent
d187a1c3d7
commit
e81db8b5fd
2 changed files with 20 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
|
* grub-core/normal/autofs.c (autoload_fs_module): Save and restore
|
||||||
|
filter state.
|
||||||
|
|
||||||
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
|
2012-07-22 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Fix coreboot compilation.
|
Fix coreboot compilation.
|
||||||
|
|
|
@ -32,11 +32,21 @@ static int
|
||||||
autoload_fs_module (void)
|
autoload_fs_module (void)
|
||||||
{
|
{
|
||||||
grub_named_list_t p;
|
grub_named_list_t p;
|
||||||
|
int ret = 0;
|
||||||
|
grub_file_filter_t grub_file_filters_was[GRUB_FILE_FILTER_MAX];
|
||||||
|
|
||||||
|
grub_memcpy (grub_file_filters_was, grub_file_filters_enabled,
|
||||||
|
sizeof (grub_file_filters_enabled));
|
||||||
|
grub_memcpy (grub_file_filters_enabled, grub_file_filters_all,
|
||||||
|
sizeof (grub_file_filters_enabled));
|
||||||
|
|
||||||
while ((p = fs_module_list) != NULL)
|
while ((p = fs_module_list) != NULL)
|
||||||
{
|
{
|
||||||
if (! grub_dl_get (p->name) && grub_dl_load (p->name))
|
if (! grub_dl_get (p->name) && grub_dl_load (p->name))
|
||||||
return 1;
|
{
|
||||||
|
ret = 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (grub_errno)
|
if (grub_errno)
|
||||||
grub_print_error ();
|
grub_print_error ();
|
||||||
|
@ -46,7 +56,10 @@ autoload_fs_module (void)
|
||||||
grub_free (p);
|
grub_free (p);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
grub_memcpy (grub_file_filters_enabled, grub_file_filters_was,
|
||||||
|
sizeof (grub_file_filters_enabled));
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Read the file fs.lst for auto-loading. */
|
/* Read the file fs.lst for auto-loading. */
|
||||||
|
|
Loading…
Reference in a new issue