diff --git a/Makefile b/Makefile index c87d58e..720be96 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ TMP_PATH=${PATH} ROOT=/ubixos +ROOT_FAT=/ubixos_fat all: kernel world install-kernel install-world @@ -67,24 +68,30 @@ @echo "Step 1: Copy Binaries" @echo "***************************************************************" cp -pr build/bin/* ${ROOT}/bin/ + cp -pr build/bin/* ${ROOT_FAT}/bin/ sync @echo @echo "***************************************************************" @echo "Step 2: Copy Libraries" @echo "***************************************************************" cp -pr build/lib/* ${ROOT}/lib/ + cp -pr build/lib/* ${ROOT_FAT}/lib/ cp -pr build/libexec/* ${ROOT}/libexec/ + cp -pr build/libexec/* ${ROOT_FAT}/libexec/ sync @echo @echo "***************************************************************" @echo "Step 3: Copy Etc" @echo "***************************************************************" cp -pr etc/* ${ROOT}/etc/ + cp -pr etc/* ${ROOT_FAT}/etc/ sync @echo @echo "***************************************************************" @echo "World Install For ${_ARCH} Completed On `LC_ALL=C date`" @echo "***************************************************************" + umount /ubixos_fat + mount /ubixos_fat clean-kernel: (cd sys;${MAKE} clean) diff --git a/sys/init/main.c b/sys/init/main.c index 1c245cf..186114e 100644 --- a/sys/init/main.c +++ b/sys/init/main.c @@ -148,19 +148,20 @@ /* Old 2 new 10 */ kprintf("[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR(rootdev), B_CONTROLLER(rootdev), B_SLICE(rootdev), B_UNIT(rootdev), B_PARTITION(rootdev), B_TYPE(rootdev)); /* if ( vfs_mount( B_UNIT(_bootdev), B_PARTITION(_bootdev), 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { */ - if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "fat", "rw") != 0x0) { + + if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "sys2", "rw") != 0x0) { //UFS FS + kprintf("Problem Mounting sys2 Mount Point\n"); + } + else + kprintf("Mounted sys2\n"); + + + if (vfs_mount(0x2, 0x1, 0x1, 0xFA, "sys", "rw") != 0x0) { //FAT FS kprintf("Problem Mounting sys Mount Point\n"); } else kprintf("Mounted sys\n"); - while (1) - asm("nop"); - - if (vfs_mount(0x2,0x1,0x1,0xFA,"sys","rw") != 0x0) { - kprintf("Problem Mounting fat Mount Point\n"); - } - /* Do our mounting */ /* if (vfs_mount(0x0,0x0,0x0,0x0,"sys","rw") != 0x0) { @@ -176,9 +177,6 @@ kprintf("MemoryMap: [0x%X]\n", vmmMemoryMap); kprintf("Starting OS\n"); -while(1) asm("nop"); - - /* kprintf("SDE Thread Start! [0x%X]\n", &sdeThread); */ /* execThread(&sdeThread, 0x2000,0x0); */ @@ -190,9 +188,10 @@ kprintf("_bootinfo.bi_bios_dev: 0x%X\n", _bootinfo.bi_bios_dev); execThread(systemTask, 0x2000, 0x0); - //execFile("sys:/bin/init", argv_init, envp_init, 0x0); /* OS Initializer */ - execFile("fat:/bin/init", argv_init, envp_init, 0x0); + execFile("sys:/bin/init", argv_init, envp_init, 0x0); /* OS Initializer */ + + //execFile("fat:/bin/init", argv_init, envp_init, 0x0); irqEnable(0x0);