From 3c9c27b8e68f51ee008cdbf0a57ad3ab7483b631 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 2 Mar 2011 19:29:24 +0000 Subject: [image] Allow download job to complete before acting upon image Allow the monojob controlling the download to complete before calling register_image() and friends. This allows the trailing "ok" from monojob.c to be printed before the image starts executing (and possibly printing output of its own). Signed-off-by: Michael Brown --- src/include/ipxe/downloader.h | 1 - src/include/usr/imgmgmt.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/include') diff --git a/src/include/ipxe/downloader.h b/src/include/ipxe/downloader.h index 3b6a9d666..a7efa3f79 100644 --- a/src/include/ipxe/downloader.h +++ b/src/include/ipxe/downloader.h @@ -13,7 +13,6 @@ struct interface; struct image; extern int create_downloader ( struct interface *job, struct image *image, - int ( * register_image ) ( struct image *image ), int type, ... ); #endif /* _IPXE_DOWNLOADER_H */ diff --git a/src/include/usr/imgmgmt.h b/src/include/usr/imgmgmt.h index 0beab5139..64e51499e 100644 --- a/src/include/usr/imgmgmt.h +++ b/src/include/usr/imgmgmt.h @@ -12,9 +12,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); struct image; extern int imgdownload ( struct image *image, struct uri *uri, - int ( * image_register ) ( struct image *image ) ); + int ( * action ) ( struct image *image ) ); extern int imgfetch ( struct image *image, const char *uri_string, - int ( * image_register ) ( struct image *image ) ); + int ( * action ) ( struct image *image ) ); extern int imgload ( struct image *image ); extern int imgexec ( struct image *image ); extern struct image * imgautoselect ( void ); -- cgit v1.2.3-55-g7522