diff options
author | Michael Brown <mcb30@etherboot.org> | 2007-08-02 20:18:32 +0100 |
---|---|---|
committer | Michael Brown <mcb30@etherboot.org> | 2007-08-02 20:18:32 +0100 |
commit | d4947c05b27449b4320179d57028a0542fd1394f (patch) | |
tree | dc9732c85f3904d04c2d7addf511c01c99dfb7fd /src/usr/autoboot.c | |
parent | 9fd6a0418f38461d6d87f2c88785028d65fd6a1c (diff) | |
download | ipxe-d4947c05b27449b4320179d57028a0542fd1394f.zip ipxe-d4947c05b27449b4320179d57028a0542fd1394f.tar.gz ipxe-d4947c05b27449b4320179d57028a0542fd1394f.tar.bz2 |
Allow images to hold references to the originating URI.
Some shuffling around of the image management code; this needs tidying up.
Diffstat (limited to 'src/usr/autoboot.c')
-rw-r--r-- | src/usr/autoboot.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index 53283d1..b5f4e9b 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -60,25 +60,15 @@ static int boot_filename ( const char *filename ) { printf ( "Out of memory\n" ); return -ENOMEM; } - if ( ( rc = imgfetch ( image, filename, 0 ) ) != 0 ) { + if ( ( rc = imgfetch ( image, filename, + register_and_autoexec_image ) ) != 0 ) { printf ( "Could not retrieve %s: %s\n", filename, strerror ( rc ) ); image_put ( image ); return rc; } - if ( ( rc = imgload ( image ) ) != 0 ) { - printf ( "Could not load %s: %s\n", image->name, - strerror ( rc ) ); - image_put ( image ); - return rc; - } - if ( ( rc = imgexec ( image ) ) != 0 ) { - printf ( "Could not execute %s: %s\n", image->name, - strerror ( rc ) ); - image_put ( image ); - return rc; - } + image_put ( image ); return 0; } |