X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsystem.c;h=546b2d80d79c668565c279d1b45eb2bc9315da94;hb=144175640d070e26aa6a661a3a0014fa69e604dd;hp=f9139185d842adc4ffd75f35bdf7a1131b10b086;hpb=d1714d8a27a603ce8ac4ba91e8c0c3d060d767ee;p=tpg%2Facess2.git

diff --git a/Kernel/system.c b/Kernel/system.c
index f9139185..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);
 		}
@@ -533,6 +537,7 @@ tConfigFile	*System_Int_ParseFile(char *FileData)
 			// Quoted
 			if( *ptr == '"' ) {
 				ptr ++;
+				ret->Lines[i].Parts[j] = ptr;
 				while( *ptr && !(*ptr == '"' && ptr[-1] == '\\') && *ptr != '\n' )
 					ptr++;
 			}