From eee5a1cf59b7594771722be98701d6fd16aa656e Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 11 Apr 2010 14:13:57 +0800 Subject: [PATCH] Fixes for running on an InitRD, moved kernel echo switch to later --- Kernel/Makefile.BuildNum | 2 +- Kernel/system.c | 14 +++++++++----- Modules/Filesystems/InitRD/Makefile | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index 791d957d..4abfa3e2 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1815 +BUILD_NUM = 1816 diff --git a/Kernel/system.c b/Kernel/system.c index a720addf..546b2d80 100644 --- a/Kernel/system.c +++ b/Kernel/system.c @@ -67,10 +67,7 @@ char *gsConfigScript = "/Acess/Conf/BootConf.cfg"; // === CODE === void System_Init(char *ArgString) -{ - // Set the debug to be echoed to the terminal - StartupPrint("Kernel now echoes to VT7 (Ctrl-Alt-F8)"); - Debug_SetKTerminal("/Devices/VTerm/7"); +{ // - Parse Kernel's Command Line System_ParseCommandLine(ArgString); @@ -78,6 +75,10 @@ void System_Init(char *ArgString) // - Execute the Config Script Log_Log("Config", "Executing config script..."); System_ExecuteScript(); + + // Set the debug to be echoed to the terminal + Log_Log("Config", "Kernel now echoes to VT7 (Ctrl-Alt-F8)"); + Debug_SetKTerminal("/Devices/VTerm/7"); } /** @@ -206,7 +207,10 @@ void System_ParseSetting(char *Arg) if(strcmp(Arg, "SCRIPT") == 0) { Log_Log("Config", "Config Script: '%s'", value); - gsConfigScript = value; + if(strlen(value) == 0) + gsConfigScript = NULL; + else + gsConfigScript = value; } else { Log_Warning("Config", "Kernel config setting '%s' is not recognised", Arg); } diff --git a/Modules/Filesystems/InitRD/Makefile b/Modules/Filesystems/InitRD/Makefile index 1a263019..2c78bf1c 100644 --- a/Modules/Filesystems/InitRD/Makefile +++ b/Modules/Filesystems/InitRD/Makefile @@ -2,7 +2,7 @@ # OBJ = main.o files.o -NAME = FS_InitRD +NAME = InitRD -include ../Makefile.tpl -- 2.20.1