sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-27 01:52:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow images to hold references to the originating URI.

Browse Source 
Some shuffling around of the image management code; this needs tidying up.
This commit is contained in:
Michael Brown
2007-08-02 20:18:32 +01:00
parent 9fd6a0418f
commit d4947c05b2
9 changed files with 189 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/usr/autoboot.c
View File

@@ -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;
}

34
src/usr/imgmgmt.c
View File

@@ -24,6 +24,7 @@
#include <gpxe/downloader.h>
#include <gpxe/monojob.h>
#include <gpxe/open.h>
#include <gpxe/uri.h>
#include <usr/imgmgmt.h>
/** @file
@@ -32,36 +33,29 @@
*
*/
static int imgfetch_autoload ( struct image *image ) {
int rc;
if ( ( rc = register_image ( image ) ) != 0 )
return rc;
if ( ( rc = image_autoload ( image ) ) != 0 )
return rc;
return 0;
}
/**
* Fetch an image
*
* @v uri_string URI as a string (e.g. "http://www.nowhere.com/vmlinuz")
* @v name Name for image, or NULL
* @ret new_image Newly created image
* @v register_image Image registration routine
* @ret rc Return status code
*/
int imgfetch ( struct image *image, const char *uri_string, int load ) {
int imgfetch ( struct image *image, const char *uri_string,
int ( * image_register ) ( struct image *image ) ) {
struct uri *uri;
int rc;
if ( ( rc = create_downloader ( &monojob, image,
( load ? imgfetch_autoload :
register_image ),
LOCATION_URI_STRING,
uri_string ) ) == 0 )
if ( ! ( uri = parse_uri ( uri_string ) ) )
return -ENOMEM;
image_set_uri ( image, uri );
if ( ( rc = create_downloader ( &monojob, image, image_register,
LOCATION_URI, uri ) ) == 0 )
rc = monojob_wait();
uri_put ( uri );
return rc;
}
@@ -118,7 +112,7 @@ void imgstat ( struct image *image ) {
printf ( " [%s]", image->type->name );
if ( image->flags & IMAGE_LOADED )
printf ( " [LOADED]" );
if ( image->cmdline[0] )
if ( image->cmdline )
printf ( " \"%s\"", image->cmdline );
printf ( "\n" );
}