Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed platform_user_menu_requested() call.

Browse Source 
Replaced its functionality by a new platform_boot_options() call.
The switch to the logo screen now comes a little later.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8049 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-06-18 15:26:53 +00:00
parent f10007bef5
commit c28f7b9932
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kernel/boot/loader/main.cpp
View File

@ -32,8 +32,6 @@ main(stage2_args *args)
if (heap_init(args) < B_OK)
panic("Could not initialize heap!\n");
platform_switch_to_logo();
TRACE(("boot(): heap initialized...\n"));
// the main platform dependent initialisation
@ -42,13 +40,16 @@ main(stage2_args *args)
if (vfs_init(args) < B_OK)
panic("Could not initialize VFS!\n");
if ((platform_boot_options() & BOOT_OPTION_DEBUG_OUTPUT) == 0)
platform_switch_to_logo();
puts("Welcome to the OpenBeOS boot loader!");
bool mountedAllVolumes = false;
Directory *volume = get_boot_file_system(args);
if (volume == NULL || platform_user_menu_requested()) {
if (volume == NULL || (platform_boot_options() & BOOT_OPTION_MENU) != 0) {
if (volume == NULL)
puts("\tno boot path found, scan for all partitions...\n");