X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fsystem.c;h=0c701c33cff61b57a5221bc2ed19d49b8ffac2b2;hb=07ed0e7479fc741a947579d4460a25a050fc9260;hp=d8eba8333db4ae5a67d9a6e8d71a888f9cf1e768;hpb=934d0f535e1929fd90ae0606e77794484aa55284;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/system.c b/KernelLand/Kernel/system.c
index d8eba833..0c701c33 100644
--- a/KernelLand/Kernel/system.c
+++ b/KernelLand/Kernel/system.c
@@ -4,8 +4,9 @@
  * system.c
  * - Architecture Independent System Init
  */
-#define DEBUG	0
+#define DEBUG	1
 #include <acess.h>
+#include <hal_proc.h>
 
 // === IMPORTS ===
 extern void	Arch_LoadBootModules(void);
@@ -44,11 +45,19 @@ void System_Init(char *CommandLine)
 	
 	// - Execute the Config Script
 	Log_Log("Config", "Spawning init '%s'", gsInitBinary);
-	Proc_Spawn(gsInitBinary);
+	if(Proc_Clone(CLONE_VM|CLONE_NOUSER) == 0)
+	{
+		const char	*args[] = {gsInitBinary, 0};
+		VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_READ|VFS_OPENFLAG_USER);	// 0: stdin
+		VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_WRITE|VFS_OPENFLAG_USER);	// 1: stdout
+		VFS_DuplicateFD(1, 2);	// 2: stderr
+		Proc_Execve(gsInitBinary, args, &args[1], 0);
+		Log_KernelPanic("System", "Unable to spawn init '%s'", gsInitBinary);
+	}
 	
 	// 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");
+	Debug_SetKTerminal("/Devices/pts/vt7");
 }
 
 /**
@@ -69,7 +78,10 @@ void System_ParseCommandLine(char *ArgString)
 		// Eat Whitespace
 		while(*str == ' ')	str++;
 		// Check for the end of the string
-		if(*str == '\0') {	argc--;	break;}	
+		if(*str == '\0') {
+			argc--;
+			break;
+		}
 		argv[argc] = str;
 		if(*str == '"') {
 			while(*str && !(*str == '"' && str[-1] != '\\'))
@@ -156,7 +168,7 @@ void System_ParseVFS(char *Arg)
 	// - Symbolic Link <link>=<destination>
 	if(value[0] == '/')
 	{
-		Log_Log("Config", "Symbolic link '%s' pointing to '%s'", Arg, value);
+//		Log_Log("Config", "Symbolic link '%s' pointing to '%s'", Arg, value);
 		VFS_Symlink(Arg, value);
 	}
 	// - Mount <mountpoint>=<fs>:<device>
@@ -171,13 +183,13 @@ void System_ParseVFS(char *Arg)
 		}
 		// Create Mountpoint
 		if( (fd = VFS_Open(Arg, 0)) == -1 ) {
-			Log_Log("Config", "Creating directory '%s'", Arg, value);
+//			Log_Log("Config", "Creating directory '%s'", Arg, value);
 			VFS_MkDir( Arg );
 		} else {
 			VFS_Close(fd);
 		}
 		// Mount
-		Log_Log("Config", "Mounting '%s' to '%s' ('%s')", dev, Arg, value);
+//		Log_Log("Config", "Mounting '%s' to '%s' ('%s')", dev, Arg, value);
 		VFS_Mount(dev, Arg, value, "");
 	}
 }