Fixes for running on an InitRD, moved kernel echo switch to later

diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum
index 791d957..4abfa3e 100644 (file)
--- 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 a720add..546b2d8 100644 (file)
--- 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 1a26301..2c78bf1 100644 (file)
--- 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