merge mine and abranches' branches. Fix several issues

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-24 21:51:57 +02:00
commit a057797f18
11 changed files with 72 additions and 19 deletions

View file

@ -26,6 +26,7 @@
#include <grub/device.h>
grub_err_t (*grub_file_net_seek) (struct grub_file *file, grub_off_t offset) = NULL;
void (*EXPORT_VAR (grub_grubnet_fini)) (void);
grub_file_filter_t grub_file_filters_all[GRUB_FILE_FILTER_MAX];
grub_file_filter_t grub_file_filters_enabled[GRUB_FILE_FILTER_MAX];

View file

@ -264,6 +264,8 @@ grub_machine_init (void)
void
grub_machine_fini (void)
{
if (grub_grubnet_fini)
grub_grubnet_fini ();
grub_ofdisk_fini ();
grub_console_fini ();
}