diff options
| author | Michael Brown | 2008-02-11 18:51:44 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-02-11 18:51:44 +0100 |
| commit | c1006ffdb713abd9b9a39b42d74a8a9f77b7b62b (patch) | |
| tree | 9f5589033b0d378adeba1eb0dc8ee619c48312ab | |
| parent | Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe (diff) | |
| download | ipxe-c1006ffdb713abd9b9a39b42d74a8a9f77b7b62b.tar.gz ipxe-c1006ffdb713abd9b9a39b42d74a8a9f77b7b62b.tar.xz ipxe-c1006ffdb713abd9b9a39b42d74a8a9f77b7b62b.zip | |
If no shell was requested via Ctrl-B, exit immediately if boot fails.
| -rw-r--r-- | src/core/main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c index 88fbb579..3295feaf 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -29,14 +29,11 @@ __cdecl int main ( void ) { initialise(); startup(); - /* Try autobooting if we're not going straight to the shell */ - if ( ! shell_banner() ) { + if ( shell_banner() ) + shell(); + else autoboot(); - } - /* Autobooting failed or the user wanted the shell */ - shell(); - shutdown(); return 0; |