aboutsummaryrefslogtreecommitdiffstats
path: root/gpxe/src/core/main.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-03-11 19:46:35 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2009-03-11 19:46:35 -0700
commitd16e5e8e8ea526326ed6f8880464399624bfe171 (patch)
tree9d1eb354f74532c219d31607e28840c4ebde3103 /gpxe/src/core/main.c
parent43224f02c231ed97a15d8300eaaf69ad8118d222 (diff)
downloadsyslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.tar.gz
syslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.tar.xz
syslinux.git-d16e5e8e8ea526326ed6f8880464399624bfe171.zip
Update gPXE to version 0.9.7syslinux-3.74-pre3
Diffstat (limited to 'gpxe/src/core/main.c')
-rw-r--r--gpxe/src/core/main.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/gpxe/src/core/main.c b/gpxe/src/core/main.c
index 8d360c42..bd2428f0 100644
--- a/gpxe/src/core/main.c
+++ b/gpxe/src/core/main.c
@@ -71,13 +71,17 @@ __asmcall int main ( void ) {
shell();
} else {
/* User doesn't want shell; load and execute the first
- * image. If booting fails (i.e. if the image
- * returns, or fails to execute), offer a second
- * chance to enter the shell for diagnostics.
+ * image, or autoboot() if we have no images. If
+ * booting fails for any reason, offer a second chance
+ * to enter the shell for diagnostics.
*/
- for_each_image ( image ) {
- image_exec ( image );
- break;
+ if ( have_images() ) {
+ for_each_image ( image ) {
+ image_exec ( image );
+ break;
+ }
+ } else {
+ autoboot();
}
if ( shell_banner() )