Browse Source

If no shell was requested via Ctrl-B, exit immediately if boot fails.

tags/v0.9.3
Michael Brown 17 years ago
parent
commit
c1006ffdb7
1 changed files with 3 additions and 6 deletions
  1. 3
    6
      src/core/main.c

+ 3
- 6
src/core/main.c View File

@@ -29,14 +29,11 @@ __cdecl int main ( void ) {
29 29
 	initialise();
30 30
 	startup();
31 31
 
32
-	/* Try autobooting if we're not going straight to the shell */
33
-	if ( ! shell_banner() ) {
32
+	if ( shell_banner() )
33
+		shell();
34
+	else
34 35
 		autoboot();
35
-	}
36 36
 	
37
-	/* Autobooting failed or the user wanted the shell */
38
-	shell();
39
-
40 37
 	shutdown();
41 38
 
42 39
 	return 0;

Loading…
Cancel
Save