http://git.etherboot.org
/
people
/
dverkamp
/
gpxe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4099046
)
If no shell was requested via Ctrl-B, exit immediately if boot fails.
author
Michael Brown
<mcb30@etherboot.org>
Mon, 11 Feb 2008 17:51:44 +0000
(17:51 +0000)
committer
Michael Brown
<mcb30@etherboot.org>
Mon, 11 Feb 2008 17:51:44 +0000
(17:51 +0000)
src/core/main.c
patch
|
blob
|
history
diff --git
a/src/core/main.c
b/src/core/main.c
index
88fbb57
..
3295fea
100644
(file)
--- 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;