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/usr/autoboot.c | |
| 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/usr/autoboot.c')
| -rw-r--r-- | src/usr/autoboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index 63ca4c3d..5bfadec0 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -158,7 +158,7 @@ int uriboot ( struct uri *filename, struct uri *root_path, int drive, /* Attempt filename boot if applicable */ if ( filename ) { if ( ( rc = imgdownload ( filename, NULL, NULL, - register_and_boot_image ) ) != 0 ) { + image_exec ) ) != 0 ) { printf ( "\nCould not chain image: %s\n", strerror ( rc ) ); /* Fall through to (possibly) attempt a SAN boot |