i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now only switches to the boot logo if no boot menu was requested.

Browse Source 
Calls platform_init_video() directly after the heap initialization - the
logo will now be shown before the VFS is initialized.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8112 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-22 00:37:46 +00:00
parent f42302bcc8
commit 81f569510c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/loader/main.cpp
+5 -4
View File
@@ -1,6 +1,6 @@
/* /*
** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved. ** Copyright 2003-2004, Axel Dörfler, [email protected]. All rights reserved.
** Distributed under the terms of the OpenBeOS License. ** Distributed under the terms of the Haiku License.
*/ */
@@ -34,15 +34,16 @@ main(stage2_args *args)
TRACE(("boot(): heap initialized...\n")); TRACE(("boot(): heap initialized...\n"));
platform_init_video();
if ((platform_boot_options() & (BOOT_OPTION_DEBUG_OUTPUT | BOOT_OPTION_MENU)) == 0)
platform_switch_to_logo();
// the main platform dependent initialisation // the main platform dependent initialisation
// has already taken place at this point. // has already taken place at this point.
if (vfs_init(args) < B_OK) if (vfs_init(args) < B_OK)
panic("Could not initialize VFS!\n"); panic("Could not initialize VFS!\n");
if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) == 0)
platform_switch_to_logo();
puts("Welcome to the Haiku boot loader!"); puts("Welcome to the Haiku boot loader!");
bool mountedAllVolumes = false; bool mountedAllVolumes = false;