From 38c7ed7c476e4a985fee9129c8150a85237d362e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 16 Mar 2010 19:39:22 +0000 Subject: [PATCH] Added kernel debug config option KDEBUG_ENABLE_DEBUG_SYSLOG which determines the default setting for the "debug syslog" feature (can still be overridden in the boot loader). Per default enabled for kdebug level >= 1. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35884 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/config_headers/kernel_debug_config.h | 4 ++++ src/system/boot/loader/menu.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/build/config_headers/kernel_debug_config.h b/build/config_headers/kernel_debug_config.h index 08aec0c48d..f286aa7547 100644 --- a/build/config_headers/kernel_debug_config.h +++ b/build/config_headers/kernel_debug_config.h @@ -24,6 +24,10 @@ // Set to 0 to disable support for kernel breakpoints. #define KERNEL_BREAKPOINTS 1 +// Enables the debug syslog feature (accessing the previous syslog in the boot +// loader) by default. Can be overridden in the boot loader menu. +#define KDEBUG_ENABLE_DEBUG_SYSLOG KDEBUG_LEVEL_1 + // block/file cache diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp index 94c73e94aa..98d65e9e44 100644 --- a/src/system/boot/loader/menu.cpp +++ b/src/system/boot/loader/menu.cpp @@ -23,6 +23,8 @@ #include #include +#include "kernel_debug_config.h" + #include "load_driver_settings.h" #include "loader.h" #include "pager.h" @@ -732,6 +734,12 @@ add_debug_menu() item->SetHelpText("Displays debug output on screen while the system " "is booting, instead of the normal boot logo."); + // set debug syslog default; doesn't really belong here, but there's no + // better place ATM +#if KDEBUG_ENABLE_DEBUG_SYSLOG + gKernelArgs.keep_debug_output_buffer = true; +#endif + menu->AddItem(item = new(nothrow) MenuItem("Enable debug syslog")); item->SetType(MENU_ITEM_MARKABLE); item->SetMarked(gKernelArgs.keep_debug_output_buffer);