Changeset 393 for Whitix/branches/hybrid/kernel

Timestamp:

05/02/08 11:36:05 (7 months ago)

Author:

mwhitworth

Message:

Rework startup function to call startup program.

Files:

• Whitix/branches/hybrid/kernel/main.c (modified) (2 diffs)

Whitix/branches/hybrid/kernel/main.c

@@ -88 +88 @@
 static void Start(void* args)
 {
-        char buf[100];
         int i;
         struct StorageDevice* rootDev=NULL;
@@ -130 +129 @@
         printf("Mounted the filesystems. Starting the shell\n");
 
-        for (i=0; i<MAX_CONSOLES; i++)
+        if (DoOpenFile(&current->files[0], DEVICES_PATH "/Consoles/Console0",FILE_READ | FILE_FORCE_OPEN,0))
         {
-                sprintf(buf,"%s/Consoles/Console%d",DEVICES_PATH,i);
-                if (DoOpenFile(&current->files[0],buf,FILE_READ | FILE_FORCE_OPEN,0))
-                {
-                        printf("Failed to open %s. Halting\n",buf);
-                        cli(); hlt();
-                }
+                printf("Failed to open the first console. Halting\n");
+                cli(); hlt();
+        }
 
-                strcat(buf,"\n\n");
-                DoWriteFile(&current->files[0],(BYTE*)(buf+strlen(DEVICES_PATH)),strlen(buf)-strlen(DEVICES_PATH));
-                extern int Exec(char* pathName,int* fds,char** argv);
-                if (Exec("/Applications/burn",fds,NULL) < 0)
-                {
-                        printf("Could not open the shell. Halting\n");
-                        cli(); hlt();
-                }
+        extern int Exec(char* pathName,int* fds,char** argv);
+        if (Exec("/System/Startup/startup", fds, NULL) < 0)
+        {
+                printf("Could not launch the startup program. Halting\n");
+                cli(); hlt();
         }