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

Allow "imgexec" with no arguments to boot the file that was loaded with

Browse Source 
"kernel".
This commit is contained in:
Michael Brown
2007-01-12 07:32:46 +00:00
parent f135a37f30
commit 2876197306
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/hci/commands/image_cmd.c
View File

@@ -304,7 +304,7 @@ static int imgexec_exec ( int argc, char **argv ) {
{ NULL, 0, NULL, 0 },
};
struct image *image;
const char *name;
const char *name = NULL;
int c;
int rc;
@@ -320,19 +320,29 @@ static int imgexec_exec ( int argc, char **argv ) {
}
}
/* Need exactly one image name */
if ( optind != ( argc - 1 ) ) {
/* Need no more than one image name */
if ( optind != argc )
name = argv[optind++];
if ( optind != argc ) {
imgexec_syntax ( argv );
return 1;
}
name = argv[optind];
/* Execute specified image */
image = find_image ( name );
if ( ! image ) {
printf ( "No such image: %s\n", name );
return 1;
if ( name ) {
image = find_image ( name );
if ( ! image ) {
printf ( "No such image: %s\n", name );
return 1;
}
} else {
image = imgautoselect();
if ( ! image ) {
printf ( "No loaded images\n" );
return 1;
}
}
if ( ( rc = imgexec ( image ) ) != 0 ) {
printf ( "Could not execute %s: %s\n", name, strerror ( rc ) );
return 1;
@@ -448,7 +458,6 @@ static int imgfree_exec ( int argc, char **argv ) {
return 0;
}
/** Image management commands */
struct command image_commands[] __command = {
{