sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-21 12:30:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

[image] Eliminate the register_and_xxx_image() functions

Browse Source 
All users of imgdownload() require registration of the image, so make
registration an integral part of imgdownload() itself and simplify the
"action" parameter to be one of image_select(), image_exec() et al.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2011-10-25 01:41:41 +01:00
parent 59e4c37741
commit 790035f78d
6 changed files with 36 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/image.c
View File

@@ -224,8 +224,8 @@ int image_exec ( struct image *image ) {
/* Sanity check */
assert ( image->flags & IMAGE_REGISTERED );
/* Check that this image can be executed */
if ( ( rc = image_probe ( image ) ) != 0 )
/* Check that this image can be selected for execution */
if ( ( rc = image_select ( image ) ) != 0 )
return rc;
/* Switch current working directory to be that of the image itself */
@@ -302,6 +302,10 @@ int image_replace ( struct image *replacement ) {
return rc;
}
/* Check that the replacement image can be executed */
if ( ( rc = image_probe ( replacement ) ) != 0 )
return rc;
/* Clear any existing replacement */
image_put ( image->replacement );