diff options
| author | Michael Brown | 2011-10-25 02:41:41 +0200 |
|---|---|---|
| committer | Michael Brown | 2011-10-25 02:41:41 +0200 |
| commit | 790035f78d6a3b11e049c9df3df41155fd3a12ef (patch) | |
| tree | e1f81cbf2fbe1fdd5a12062b88b10fd55ca7a668 /src/arch | |
| parent | [cmdline] Allow "sleep" command to be interrupted (diff) | |
| download | ipxe-790035f78d6a3b11e049c9df3df41155fd3a12ef.tar.gz ipxe-790035f78d6a3b11e049c9df3df41155fd3a12ef.tar.xz ipxe-790035f78d6a3b11e049c9df3df41155fd3a12ef.zip | |
[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>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/interface/syslinux/comboot_call.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 571ba9e6d..818cae840 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -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; |