From 81f569510c4a0db4181c65396d6d0ce5f67b276f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 22 Jun 2004 00:37:46 +0000 Subject: [PATCH] Now only switches to the boot logo if no boot menu was requested. 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 --- src/kernel/boot/loader/main.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernel/boot/loader/main.cpp b/src/kernel/boot/loader/main.cpp index 76277bf980..845698aea5 100644 --- a/src/kernel/boot/loader/main.cpp +++ b/src/kernel/boot/loader/main.cpp @@ -1,6 +1,6 @@ /* ** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. 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")); + platform_init_video(); + if ((platform_boot_options() & (BOOT_OPTION_DEBUG_OUTPUT | BOOT_OPTION_MENU)) == 0) + platform_switch_to_logo(); + // the main platform dependent initialisation // has already taken place at this point. 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 Haiku boot loader!"); bool mountedAllVolumes = false;