diff --git a/src/bin/init/main.c b/src/bin/init/main.c index 729fd68..9f405c4 100644 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -52,16 +52,20 @@ printf("Initializing UbixOS\n"); +#if 0 /* Start TTYD */ i = fork(); - + if (0x0 == i) { exec("sys:/ttyd",0x0,0x0); printf("Error: Could not start TTYD\n"); exit(0x0); } + while (pidStatus(i) > 0x0) sched_yield(); +#endif + i = fork(); if (0x0 == i) { @@ -108,6 +112,9 @@ /*** $Log$ + Revision 1.26 2004/09/11 12:11:11 reddawg + Cleaning up the VFS more changes to follow... + Revision 1.25 2004/09/08 23:19:58 reddawg hmm diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 55743d3..b4d4e15 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -111,7 +111,7 @@ /* Initialize the system */ execThread(systemTask,(kmalloc(0x2000)+0x2000),0x0); - //execFile("sys:/init",0x0,0x0,0x1); + execFile("sys:/init",0x0,0x0,0x1); /* execFile("sys:/login",0x0,0x0,0x1); @@ -134,6 +134,9 @@ /*** $Log$ + Revision 1.83 2004/09/11 12:11:11 reddawg + Cleaning up the VFS more changes to follow... + Revision 1.82 2004/09/07 21:54:38 reddawg ok reverted back to old scheduling for now.... diff --git a/src/tools/Makefile b/src/tools/Makefile index d06e5c3..b77e430 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -52,7 +52,7 @@ (cp ../bin/ld/ld.so ./) #(cp /lib/libc.so.5 ./) (cp ../bin/ttyd/ttyd ./) - (./format 50 2000 /dev/fd0 ubix.elf 0 login 3754 ROM8X14.DPF 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 mbr 3754 cp 3754 clock 3754 libc_old.so 3754 ld.so 3754 ttyd 3754) + (./format 50 2000 /dev/fd0 ubix.elf 0 login 3754 ROM8X14.DPF 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 cp 3754 clock 3754 libc_old.so 3754 ld.so 3754 ttyd 3754 mbr 3754) # (./format 50 2000 /dev/fd0 ubix.elf 0 login 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 motd 3754 libc_old.so 3754 ld.so 3754 test 3754 libc.so.5 3754) #(./format 263 204361 /dev/md1 ubix.elf 0 format 3754 fdisk 3754 ROM8X14.DPF 3754 init 3754 login 3754 shell 3754 userdb 3754 ls 3754 motd 3754 cp 3754)