From c28f7b993265007c4a7d11cbb60fb9559d5d9395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 18 Jun 2004 15:26:53 +0000 Subject: [PATCH] Removed platform_user_menu_requested() call. 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 --- src/kernel/boot/loader/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kernel/boot/loader/main.cpp b/src/kernel/boot/loader/main.cpp index 7daebbd2ec..cf111fa534 100644 --- a/src/kernel/boot/loader/main.cpp +++ b/src/kernel/boot/loader/main.cpp @@ -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");