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

3
grub-core/loader/i386/pc/pxechainloader.c
View file

@ -139,7 +139,8 @@ grub_cmd_pxechain (grub_command_t cmd __attribute__ ((unused)),
if (grub_file_read (file, image, imagesize) != (grub_ssize_t) imagesize)
goto fail;
grub_loader_set (grub_pxechain_boot, grub_pxechain_unload, 1);
grub_loader_set (grub_pxechain_boot, grub_pxechain_unload,
GRUB_LOADER_FLAG_NORETURN | GRUB_LOADER_FLAG_PXE_NOT_UNLOAD);
return GRUB_ERR_NONE;
fail: