mirror of
https://github.com/ipxe/ipxe
synced 2025-12-25 00:17:57 +03:00
[image] Eliminate the register_and_xxx_image() functions
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:
@@ -185,7 +185,7 @@ static int comboot_fetch_kernel ( char *kernel_file, char *cmdline ) {
|
||||
|
||||
/* Fetch initrd */
|
||||
if ( ( rc = imgdownload_string ( initrd_file, NULL, NULL,
|
||||
register_and_put_image ))!=0){
|
||||
NULL ) ) != 0 ) {
|
||||
DBG ( "COMBOOT: could not fetch initrd: %s\n",
|
||||
strerror ( rc ) );
|
||||
return rc;
|
||||
@@ -200,7 +200,7 @@ static int comboot_fetch_kernel ( char *kernel_file, char *cmdline ) {
|
||||
|
||||
/* Allocate and fetch kernel */
|
||||
if ( ( rc = imgdownload_string ( kernel_file, NULL, cmdline,
|
||||
register_and_replace_image ) ) != 0 ) {
|
||||
image_replace ) ) != 0 ) {
|
||||
DBG ( "COMBOOT: could not fetch kernel: %s\n",
|
||||
strerror ( rc ) );
|
||||
return rc;
|
||||
|
||||
Reference in New Issue
Block a user