From c1006ffdb713abd9b9a39b42d74a8a9f77b7b62b Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 11 Feb 2008 17:51:44 +0000
Subject: If no shell was requested via Ctrl-B, exit immediately if boot fails.

---
 src/core/main.c | 9 +++------
 1 file 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;
-- 
cgit v1.2.3-55-g7522