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

[test] Allow self-tests to report exit status when running under Linux

Browse Source 
Allow the return status from an embedded image to propagate out to the
eventual return status from main().  When running under Linux, this
allows the pass/fail result of unit tests to be observable without
having to visually inspect the console output.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2015-08-21 15:41:35 +01:00
parent fb4ce72e64
commit f58ebbdfb5
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/usr/autoboot.c
View File

@@ -542,11 +542,13 @@ static int shell_banner ( void ) {
* Main iPXE flow of execution
*
* @v netdev Network device, or NULL
* @ret rc Return status code
*/
void ipxe ( struct net_device *netdev ) {
int ipxe ( struct net_device *netdev ) {
struct feature *feature;
struct image *image;
char *scriptlet;
int rc;
/*
* Print welcome banner
@@ -570,28 +572,30 @@ void ipxe ( struct net_device *netdev ) {
/* Boot system */
if ( ( image = first_image() ) != NULL ) {
/* We have an embedded image; execute it */
image_exec ( image );
return image_exec ( image );
} else if ( shell_banner() ) {
/* User wants shell; just give them a shell */
shell();
return shell();
} else {
fetch_string_setting_copy ( NULL, &scriptlet_setting,
&scriptlet );
if ( scriptlet ) {
/* User has defined a scriptlet; execute it */
system ( scriptlet );
rc = system ( scriptlet );
free ( scriptlet );
return rc;
} else {
/* Try booting. If booting fails, offer the
* user another chance to enter the shell.
*/
if ( netdev ) {
netboot ( netdev );
rc = netboot ( netdev );
} else {
autoboot();
rc = autoboot();
}
if ( shell_banner() )
shell();
rc = shell();
return rc;
}
}
}