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

Terminate UNDI and PXE before launching the payload to avoid problems

Browse source 
with DMA.

	* grub-core/commands/boot.c (grub_loader_noreturn): Rename to ...
	(grub_loader_flags): ... this. All users updated.
	(grub_loader_boot): Check for GRUB_LOADER_FLAG_NORETURN.
	* grub-core/loader/i386/pc/pxechainloader.c (grub_cmd_pxechain): Mark
	loader as GRUB_LOADER_FLAG_PXE_NOT_UNLOAD.
	* grub-core/net/drivers/i386/pc/pxe.c (grub_pxe_shutdown): New
	function.
	(grub_pxe_restore): Likewise.
	(fini_hnd): New var.
	(GRUB_MOD_INIT): Register shutdown hook.
	(GRUB_MOD_FINI): Shutdown and unregister shutdown hook.
	* include/grub/loader.h (GRUB_LOADER_FLAG_NORETURN): New const.
	(GRUB_LOADER_FLAG_PXE_NOT_UNLOAD): Likewise.
	(grub_loader_set): Rename second argument to flags.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-11 22:32:31 +02:00
parent 851ffadac2
commit 3c491b479c
5 changed files with 75 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
grub-core/net/drivers/i386/pc/pxe.c
View file

@ -24,6 +24,7 @@
#include <grub/misc.h>
#include <grub/env.h>
#include <grub/i18n.h>
#include <grub/loader.h>
#include <grub/machine/pxe.h>
#include <grub/machine/int.h>
@ -311,6 +312,36 @@ struct grub_net_card grub_pxe_card =
.name = "pxe"
};
static grub_err_t
grub_pxe_shutdown (int flags)
{
if (flags & GRUB_LOADER_FLAG_PXE_NOT_UNLOAD)
return GRUB_ERR_NONE;
if (!pxe_rm_entry)
return GRUB_ERR_NONE;
grub_pxe_call (GRUB_PXENV_UNDI_CLOSE,
(void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR,
pxe_rm_entry);
grub_pxe_call (GRUB_PXENV_UNDI_SHUTDOWN,
(void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR,
pxe_rm_entry);
grub_pxe_call (GRUB_PXENV_UNLOAD_STACK,
(void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR,
pxe_rm_entry);
pxe_rm_entry = 0;
grub_net_card_unregister (&grub_pxe_card);
return GRUB_ERR_NONE;
}
/* Nothing we can do. */
static grub_err_t
grub_pxe_restore (void)
{
return GRUB_ERR_NONE;
}
void *
grub_pxe_get_cached (grub_uint16_t type)
{
@ -340,6 +371,8 @@ grub_pc_net_config_real (char **device, char **path)
}
static struct grub_preboot *fini_hnd;
GRUB_MOD_INIT(pxe)
{
struct grub_pxe_bangpxe *pxenv;
@ -374,10 +407,14 @@ GRUB_MOD_INIT(pxe)
grub_net_card_register (&grub_pxe_card);
grub_pc_net_config = grub_pc_net_config_real;
fini_hnd = grub_loader_register_preboot_hook (grub_pxe_shutdown,
grub_pxe_restore,
GRUB_LOADER_PREBOOT_HOOK_PRIO_DISK);
}
GRUB_MOD_FINI(pxe)
{
grub_pc_net_config = 0;
grub_net_card_unregister (&grub_pxe_card);
grub_pxe_shutdown (0);
grub_loader_unregister_preboot_hook (fini_hnd);
}